' ).addClass( 'mw-spinner' ).attr( 'title', '...' ); + $spinner = $( '

' ).addClass( 'mw-spinner' ).attr( 'title', '...' ); if ( opts.id !== undefined ) { $spinner.attr( 'id', 'mw-spinner-' + opts.id ); } diff --git a/resources/src/jquery/jquery.suggestions.js b/resources/src/jquery/jquery.suggestions.js index 884ecb6e96..f3e4e09313 100644 --- a/resources/src/jquery/jquery.suggestions.js +++ b/resources/src/jquery/jquery.suggestions.js @@ -353,7 +353,6 @@ $results.empty(); expWidth = -1; for ( i = 0; i < context.config.suggestions.length; i++ ) { - /*jshint loopfunc:true */ text = context.config.suggestions[ i ]; $result = $( '

' ) .addClass( 'suggestions-result' ) @@ -758,9 +757,9 @@ 46, // delete 8 // backspace ]; - if ( context.data.keypressedCount === 0 - && e.which === context.data.keypressed - && $.inArray( e.which, allowed ) !== -1 + if ( context.data.keypressedCount === 0 && + e.which === context.data.keypressed && + $.inArray( e.which, allowed ) !== -1 ) { $.suggestions.keypress( e, context, context.data.keypressed ); } diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery/jquery.tablesorter.js index 62be0d8c4a..4da05e63ef 100644 --- a/resources/src/jquery/jquery.tablesorter.js +++ b/resources/src/jquery/jquery.tablesorter.js @@ -407,8 +407,8 @@ * in default (ascending) order when their header cell is clicked the next time. * * @param {jQuery} $headers - * @param {number[][]} sortList - * @param {number[][]} headerToColumns + * @param {Array} sortList 2D number array + * @param {Array} headerToColumns 2D number array */ function setHeadersOrder( $headers, sortList, headerToColumns ) { // Loop through all headers to retrieve the indices of the columns the header spans across: @@ -442,10 +442,11 @@ } function setHeadersCss( table, $headers, list, css, msg, columnToHeader ) { + var i, len; // Remove all header information and reset titles to default message $headers.removeClass( css[ 0 ] ).removeClass( css[ 1 ] ).attr( 'title', msg[ 1 ] ); - for ( var i = 0; i < list.length; i++ ) { + for ( i = 0, len = list.length; i < len; i++ ) { $headers .eq( columnToHeader[ list[ i ][ 0 ] ] ) .addClass( css[ list[ i ][ 1 ] ] ) @@ -686,12 +687,10 @@ } function buildCollationTable() { + var key, keys = []; ts.collationTable = mw.config.get( 'tableSorterCollation' ); ts.collationRegex = null; if ( ts.collationTable ) { - var key, - keys = []; - // Build array of key names for ( key in ts.collationTable ) { // Check hasOwn to be safe @@ -755,298 +754,300 @@ /* Public scope */ $.tablesorter = { - defaultOptions: { - cssHeader: 'headerSort', - cssAsc: 'headerSortUp', - cssDesc: 'headerSortDown', - cssChildRow: 'expand-child', - sortMultiSortKey: 'shiftKey', - unsortableClass: 'unsortable', - parsers: [], - cancelSelection: true, - sortList: [], - headerList: [], - headerToColumns: [], - columnToHeader: [], - columns: 0 - }, - - dateRegex: [], - monthNames: {}, - - /** - * @param {jQuery} $tables - * @param {Object} [settings] - */ - construct: function ( $tables, settings ) { - return $tables.each( function ( i, table ) { - // Declare and cache. - var $headers, cache, config, sortCSS, sortMsg, - $table = $( table ), - firstTime = true; - - // Quit if no tbody - if ( !table.tBodies ) { + defaultOptions: { + cssHeader: 'headerSort', + cssAsc: 'headerSortUp', + cssDesc: 'headerSortDown', + cssChildRow: 'expand-child', + sortMultiSortKey: 'shiftKey', + unsortableClass: 'unsortable', + parsers: [], + cancelSelection: true, + sortList: [], + headerList: [], + headerToColumns: [], + columnToHeader: [], + columns: 0 + }, + + dateRegex: [], + monthNames: {}, + + /** + * @param {jQuery} $tables + * @param {Object} [settings] + * @return {jQuery} + */ + construct: function ( $tables, settings ) { + return $tables.each( function ( i, table ) { + // Declare and cache. + var $headers, cache, config, sortCSS, sortMsg, + $table = $( table ), + firstTime = true; + + // Quit if no tbody + if ( !table.tBodies ) { + return; + } + if ( !table.tHead ) { + // No thead found. Look for rows with s and + // move them into a tag or a tag + emulateTHeadAndFoot( $table ); + + // Still no thead? Then quit + if ( !table.tHead ) { return; } - if ( !table.tHead ) { - // No thead found. Look for rows with s and - // move them into a tag or a tag - emulateTHeadAndFoot( $table ); + } + $table.addClass( 'jquery-tablesorter' ); - // Still no thead? Then quit - if ( !table.tHead ) { - return; - } - } - $table.addClass( 'jquery-tablesorter' ); - - // Merge and extend - config = $.extend( {}, $.tablesorter.defaultOptions, settings ); - - // Save the settings where they read - $.data( table, 'tablesorter', { config: config } ); - - // Get the CSS class names, could be done elsewhere - sortCSS = [ config.cssAsc, config.cssDesc ]; - // Messages tell the the user what the *next* state will be - // so are in reverse order to the CSS classes. - sortMsg = [ mw.msg( 'sort-descending' ), mw.msg( 'sort-ascending' ) ]; - - // Build headers - $headers = buildHeaders( table, sortMsg ); - - // Grab and process locale settings. - buildTransformTable(); - buildDateTable(); - - // Precaching regexps can bring 10 fold - // performance improvements in some browsers. - cacheRegexs(); - - function setupForFirstSort() { - firstTime = false; - - // Defer buildCollationTable to first sort. As user and site scripts - // may customize tableSorterCollation but load after $.ready(), other - // scripts may call .tablesorter() before they have done the - // tableSorterCollation customizations. - buildCollationTable(); - - // Legacy fix of .sortbottoms - // Wrap them inside a tfoot (because that's what they actually want to be) - // and put the at the end of the - var $tfoot, - $sortbottoms = $table.find( '> tbody > tr.sortbottom' ); - if ( $sortbottoms.length ) { - $tfoot = $table.children( 'tfoot' ); - if ( $tfoot.length ) { - $tfoot.eq( 0 ).prepend( $sortbottoms ); - } else { - $table.append( $( '' ).append( $sortbottoms ) ); - } - } + // Merge and extend + config = $.extend( {}, $.tablesorter.defaultOptions, settings ); - explodeRowspans( $table ); - manageColspans( $table ); + // Save the settings where they read + $.data( table, 'tablesorter', { config: config } ); - // Try to auto detect column type, and store in tables config - config.parsers = buildParserCache( table, $headers ); - } + // Get the CSS class names, could be done elsewhere + sortCSS = [ config.cssAsc, config.cssDesc ]; + // Messages tell the the user what the *next* state will be + // so are in reverse order to the CSS classes. + sortMsg = [ mw.msg( 'sort-descending' ), mw.msg( 'sort-ascending' ) ]; - // Apply event handling to headers - // this is too big, perhaps break it out? - $headers.on( 'keypress click', function ( e ) { - var cell, $cell, columns, newSortList, i, - totalRows, - j, s, o; - - if ( e.type === 'click' && e.target.nodeName.toLowerCase() === 'a' ) { - // The user clicked on a link inside a table header. - // Do nothing and let the default link click action continue. - return true; - } + // Build headers + $headers = buildHeaders( table, sortMsg ); - if ( e.type === 'keypress' && e.which !== 13 ) { - // Only handle keypresses on the "Enter" key. - return true; - } + // Grab and process locale settings. + buildTransformTable(); + buildDateTable(); - if ( firstTime ) { - setupForFirstSort(); + // Precaching regexps can bring 10 fold + // performance improvements in some browsers. + cacheRegexs(); + + function setupForFirstSort() { + var $tfoot, $sortbottoms; + + firstTime = false; + + // Defer buildCollationTable to first sort. As user and site scripts + // may customize tableSorterCollation but load after $.ready(), other + // scripts may call .tablesorter() before they have done the + // tableSorterCollation customizations. + buildCollationTable(); + + // Legacy fix of .sortbottoms + // Wrap them inside a tfoot (because that's what they actually want to be) + // and put the at the end of the

+ $sortbottoms = $table.find( '> tbody > tr.sortbottom' ); + if ( $sortbottoms.length ) { + $tfoot = $table.children( 'tfoot' ); + if ( $tfoot.length ) { + $tfoot.eq( 0 ).prepend( $sortbottoms ); + } else { + $table.append( $( '' ).append( $sortbottoms ) ); } + } - // Build the cache for the tbody cells - // to share between calculations for this sort action. - // Re-calculated each time a sort action is performed due to possiblity - // that sort values change. Shouldn't be too expensive, but if it becomes - // too slow an event based system should be implemented somehow where - // cells get event .change() and bubbles up to the

here - cache = buildCache( table ); - - totalRows = ( $table[ 0 ].tBodies[ 0 ] && $table[ 0 ].tBodies[ 0 ].rows.length ) || 0; - if ( totalRows > 0 ) { - cell = this; - $cell = $( cell ); - - // Get current column sort order - $cell.data( { - order: $cell.data( 'count' ) % 2, - count: $cell.data( 'count' ) + 1 - } ); + explodeRowspans( $table ); + manageColspans( $table ); - cell = this; - // Get current column index - columns = config.headerToColumns[ $cell.data( 'headerIndex' ) ]; - newSortList = $.map( columns, function ( c ) { - // jQuery "helpfully" flattens the arrays... - return [ [ c, $cell.data( 'order' ) ] ]; - } ); - // Index of first column belonging to this header - i = columns[ 0 ]; + // Try to auto detect column type, and store in tables config + config.parsers = buildParserCache( table, $headers ); + } - if ( !e[ config.sortMultiSortKey ] ) { - // User only wants to sort on one column set - // Flush the sort list and add new columns - config.sortList = newSortList; - } else { - // Multi column sorting - // It is not possible for one column to belong to multiple headers, - // so this is okay - we don't need to check for every value in the columns array - if ( isValueInArray( i, config.sortList ) ) { - // The user has clicked on an already sorted column. - // Reverse the sorting direction for all tables. - for ( j = 0; j < config.sortList.length; j++ ) { - s = config.sortList[ j ]; - o = config.headerList[ config.columnToHeader[ s[ 0 ] ] ]; - if ( isValueInArray( s[ 0 ], newSortList ) ) { - $( o ).data( 'count', s[ 1 ] + 1 ); - s[ 1 ] = $( o ).data( 'count' ) % 2; - } + // Apply event handling to headers + // this is too big, perhaps break it out? + $headers.on( 'keypress click', function ( e ) { + var cell, $cell, columns, newSortList, i, + totalRows, + j, s, o; + + if ( e.type === 'click' && e.target.nodeName.toLowerCase() === 'a' ) { + // The user clicked on a link inside a table header. + // Do nothing and let the default link click action continue. + return true; + } + + if ( e.type === 'keypress' && e.which !== 13 ) { + // Only handle keypresses on the "Enter" key. + return true; + } + + if ( firstTime ) { + setupForFirstSort(); + } + + // Build the cache for the tbody cells + // to share between calculations for this sort action. + // Re-calculated each time a sort action is performed due to possiblity + // that sort values change. Shouldn't be too expensive, but if it becomes + // too slow an event based system should be implemented somehow where + // cells get event .change() and bubbles up to the

' ) + .addClass( 'api-pretty-header api-pretty-status' ) + .append( + mw.message( 'api-format-prettyprint-status', data.status, data.statustext ).parse() + ) + .appendTo( $result ); + } $result.append( Util.parseHTML( data.html ) ); loadTime = data.time; } else if ( ( m = data.match( /][\s\S]*<\/pre>/ ) ) ) { @@ -948,6 +1030,32 @@ .text( data ) .appendTo( $result ); } + if ( paramsAreForced || data[ 'continue' ] ) { + $result.append( + $( '

' ).append( + new OO.ui.ButtonWidget( { + label: mw.message( 'apisandbox-continue' ).text() + } ).on( 'click', function () { + ApiSandbox.sendRequest( $.extend( {}, baseRequestParams, data[ 'continue' ] ) ); + } ).setDisabled( !data[ 'continue' ] ).$element, + ( clear = new OO.ui.ButtonWidget( { + label: mw.message( 'apisandbox-continue-clear' ).text() + } ).on( 'click', function () { + ApiSandbox.updateUI( baseRequestParams ); + clear.setDisabled( true ); + booklet.setPage( '|results|' ); + } ).setDisabled( !paramsAreForced ) ).$element, + new OO.ui.PopupButtonWidget( { + framed: false, + icon: 'info', + popup: { + $content: $( '

' ).append( mw.message( 'apisandbox-continue-help' ).parse() ), + padded: true + } + } ).$element + ) + ); + } if ( typeof loadTime === 'number' ) { $result.append( $( '

' ).append( @@ -1271,16 +1379,24 @@ if ( pi.parameters[ i ].highmax !== undefined ) { dl.append( $( '

', { addClass: 'info', - append: Util.parseHTML( mw.message( - 'api-help-param-limit2', pi.parameters[ i ].max, pi.parameters[ i ].highmax - ).parse() ) + append: [ + Util.parseHTML( mw.message( + 'api-help-param-limit2', pi.parameters[ i ].max, pi.parameters[ i ].highmax + ).parse() ), + ' ', + Util.parseHTML( mw.message( 'apisandbox-param-limit' ).parse() ) + ] } ) ); } else { dl.append( $( '

@@ -50,13 +50,28 @@ vertical-align: middle; // Content styling - .button-colors( #fff, @colorGray12, @colorGray7 ); + .button-colors( @colorGray15, #fff, #d9d9d9 ); text-align: center; font-weight: bold; // Interaction styling cursor: pointer; + &:focus { + outline-width: 0; + + // Remove the inner border and padding in Firefox. + &::-moz-focus-inner { + border-color: transparent; + padding: 0; + } + } + + // `:not()` is used exclusively for `transition`s as both are not supported by IE < 9 + &:not( :disabled ) { + .transition( ~'background-color 100ms, color 100ms, border-color 100ms, box-shadow 100ms' ); + } + &:disabled { text-shadow: none; cursor: default; @@ -78,9 +93,6 @@ // //

- // - //

- //

// //

// @@ -101,9 +113,6 @@ // //

- // - //

- //

// //

// @@ -118,7 +127,7 @@ // Progressive buttons // // Use progressive buttons for actions which lead to a next step in the process. - // .mw-ui-primary is deprecated, kept for compatibility. + // .mw-ui-constructive is deprecated; consolidated with `progressive`, see T110555 // // Markup: //

@@ -130,31 +139,8 @@ // // Styleguide 2.1.1. &.mw-ui-progressive, - &.mw-ui-primary { - .button-colors( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive ); - - &.mw-ui-quiet { - .button-colors-quiet( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive ); - } - } - - // Constructive buttons (deprecated, consolidated with `progressive` â see T110555) - // - // Use constructive buttons for actions which result in a final action in the process that results - // in a change of state. - // e.g. save changes button - // - // Markup: - //

- // - //

- //

- // - //

- // - // Styleguide 2.1.2. &.mw-ui-constructive { - .button-colors( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive ); + .button-colors-primary( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive ); &.mw-ui-quiet { .button-colors-quiet( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive ); @@ -174,9 +160,9 @@ // //

// - // Styleguide 2.1.3. + // Styleguide 2.1.2. &.mw-ui-destructive { - .button-colors( @colorDestructive, @colorDestructiveHighlight, @colorDestructiveActive ); + .button-colors-primary( @colorDestructive, @colorDestructiveHighlight, @colorDestructiveActive ); &.mw-ui-quiet { .button-colors-quiet( @colorDestructive, @colorDestructiveHighlight, @colorDestructiveActive ); @@ -185,7 +171,7 @@ // Quiet buttons // - // Use quiet buttons when they are less important and alongside other constructive, progressive or destructive buttons. It should be used for an action that exits the user from the current view/workflow. + // Use quiet buttons when they are less important and alongside other progressive or destructive buttons. It should be used for an action that exits the user from the current view/workflow. // Its use is not recommended on mobile/tablet due to lack of hover state. // // Markup: @@ -193,12 +179,6 @@ // //

- // - //

- //

- // - //

- //

// //

@@ -211,7 +191,7 @@ // //

// - // Styleguide 2.1.4. + // Styleguide 2.1.3. &.mw-ui-quiet { background: transparent; border: 0; diff --git a/resources/src/mediawiki.ui/components/forms.less b/resources/src/mediawiki.ui/components/forms.less index cc96a5c09c..2327efc73b 100644 --- a/resources/src/mediawiki.ui/components/forms.less +++ b/resources/src/mediawiki.ui/components/forms.less @@ -30,7 +30,7 @@ // //

-// +// //

// // @@ -103,6 +103,7 @@ // // Styleguide 5.2. .error, + .warning, .errorbox, .warningbox, .successbox { @@ -118,7 +119,13 @@ color: @colorErrorText; border: 1px solid #fac5c5; background-color: #fae3e3; - text-shadow: 0 1px #fae3e3; + } + + // Colours taken from those for .warningbox in shared.css + .warning { + color: @colorWarningText; + border: 1px solid #fde29b; + background-color: #fdf1d1; } // This specifies styling for individual field validation error messages. diff --git a/resources/src/mediawiki.ui/components/inputs.less b/resources/src/mediawiki.ui/components/inputs.less index 76fee23e21..8bddb3a169 100644 --- a/resources/src/mediawiki.ui/components/inputs.less +++ b/resources/src/mediawiki.ui/components/inputs.less @@ -4,11 +4,6 @@ @import "mediawiki.ui/variables"; @import "mediawiki.ui/mixins"; -// Placeholder text styling helper -.field-placeholder-styling() { - font-style: italic; - font-weight: normal; -} // Text inputs // // Apply the mw-ui-input class to input and textarea fields. @@ -27,45 +22,74 @@ // // Styleguide 1.1. .mw-ui-input { + background-color: #fff; .box-sizing( border-box ); display: block; width: 100%; border: 1px solid @colorFieldBorder; border-radius: @borderRadius; padding: 0.3em 0.3em 0.3em 0.6em; + // necessary for smooth transition + box-shadow: inset 0 0 0 0.1em #fff; font-family: inherit; font-size: inherit; line-height: inherit; vertical-align: middle; - // Placeholder text styling must be set individually for each browser @winter - &::-webkit-input-placeholder { // webkit - .field-placeholder-styling; + // Normalize & style placeholder text, see T139034 + // Placeholder styles can't be grouped, otherwise they're ignored as invalid. + + // Placeholder mixin + .mixin-placeholder() { + color: @colorGray7; + font-style: italic; + } + // Firefox 4-18 + &:-moz-placeholder { // stylelint-disable-line selector-no-vendor-prefix + .mixin-placeholder; + opacity: 1; + } + // Firefox 19- + &::-moz-placeholder { // stylelint-disable-line selector-no-vendor-prefix + .mixin-placeholder; + opacity: 1; } - &::-moz-placeholder { // FF 4-18 - .field-placeholder-styling; + // Internet Explorer 10-11 + &:-ms-input-placeholder { // stylelint-disable-line selector-no-vendor-prefix + .mixin-placeholder; } - &:-moz-placeholder { // FF >= 19 - .field-placeholder-styling; + // WebKit, Blink, Edge + // Don't set `opacity < 1`, see https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/3901363/ + &::-webkit-input-placeholder { // stylelint-disable-line selector-no-vendor-prefix + .mixin-placeholder; } - &:-ms-input-placeholder { // IE >= 10 - .field-placeholder-styling; + // W3C Standard Selectors Level 4 + &:placeholder-shown { + .mixin-placeholder; } - // Remove red outline from inputs which have required field and invalid content. - // This is a Firefox only issue + // Firefox: Remove red outline when `required` attribute set and invalid content. // See https://developer.mozilla.org/en-US/docs/Web/CSS/:invalid - // This should be above :focus so focus behaviour takes preference + // This should come before `:focus` so latter rules take preference. &:invalid { box-shadow: none; } + &:hover { + border-color: @colorGray7; + } + &:focus { border-color: @colorProgressive; box-shadow: inset 0 0 0 1px @colorProgressive; outline: 0; } + // `:not()` is used exclusively for `transition`s as both are not supported by IE < 9. + &:not( :disabled ) { + .transition( ~'color 100ms, border-color 100ms, box-shadow 100ms' ); + } + &:disabled { border-color: @colorGray14; color: @colorGray12; @@ -76,7 +100,7 @@ // Correct the odd appearance in Chrome and Safari 5 -webkit-appearance: textfield; - // Remove proprietary clear button in IE 10-11 + // Remove proprietary clear button in IE 10-11, Edge 12+ &::-ms-clear { display: none; } @@ -99,7 +123,7 @@ textarea.mw-ui-input { // // Markup: // -// +// // // Styleguide 1.2. input[type="number"], diff --git a/resources/src/mediawiki.ui/components/text.less b/resources/src/mediawiki.ui/components/text.less index cc27e9e357..555174559f 100644 --- a/resources/src/mediawiki.ui/components/text.less +++ b/resources/src/mediawiki.ui/components/text.less @@ -16,10 +16,10 @@ Text Context classes may be used on elements with only plain-text content with the mw-ui-text base. When the context classes are used on interactive and block-level elements, the appropriate alternative base type classes should also be used. For example, mw-ui-anchor with A, or mw-ui-button with buttons. +'Constructive' is deprecated and merged with 'Progressive'. Markup: Progressive -Constructive Destructive Styleguide 6.1. @@ -28,11 +28,9 @@ Styleguide 6.1. .mw-ui-text { // The selector order is like this on purpose; IE 6 ignores the second selector, // so we don't want to accidentally apply this color on all mw-ui-CONTEXT classes - .mw-ui-progressive& { - color: @colorProgressive; - } + .mw-ui-progressive&, .mw-ui-constructive& { - color: @colorConstructive; + color: @colorProgressive; } .mw-ui-destructive& { color: @colorDestructive; diff --git a/resources/src/mediawiki.widgets.datetime/CalendarWidget.js b/resources/src/mediawiki.widgets.datetime/CalendarWidget.js index 31b1cd5b44..54a5a850bc 100644 --- a/resources/src/mediawiki.widgets.datetime/CalendarWidget.js +++ b/resources/src/mediawiki.widgets.datetime/CalendarWidget.js @@ -202,6 +202,7 @@ return this.selected; }; + // eslint-disable-next-line valid-jsdoc /** * Set the selected dates * @@ -250,6 +251,7 @@ return this.focusedDate; }; + // eslint-disable-next-line valid-jsdoc /** * Set the currently-focused date * @@ -498,6 +500,7 @@ * * @protected * @param {jQuery.Event} e Key down event + * @return {boolean} False to cancel the default event */ mw.widgets.datetime.CalendarWidget.prototype.onKeyDown = function ( e ) { var focusedDate = this.getFocusedDate(); diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js index 1c542341d3..1793849368 100644 --- a/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js +++ b/resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js @@ -21,23 +21,21 @@ * Defaults to the current date and time (with 0 milliseconds). */ mw.widgets.datetime.DateTimeFormatter = function MwWidgetsDatetimeDateTimeFormatter( config ) { - var statick = this.constructor[ 'static' ]; - - statick.setupDefaults(); + this.constructor.static.setupDefaults(); config = $.extend( { format: '@default', local: false, - fullZones: statick.fullZones, - shortZones: statick.shortZones + fullZones: this.constructor.static.fullZones, + shortZones: this.constructor.static.shortZones }, config ); // Mixin constructors OO.EventEmitter.call( this ); // Properties - if ( statick.formats[ config.format ] ) { - this.format = statick.formats[ config.format ]; + if ( this.constructor.static.formats[ config.format ] ) { + this.format = this.constructor.static.formats[ config.format ]; } else { this.format = config.format; } @@ -70,7 +68,7 @@ * @inheritable * @property {Object} */ - mw.widgets.datetime.DateTimeFormatter[ 'static' ].formats = {}; + mw.widgets.datetime.DateTimeFormatter.static.formats = {}; /** * Default time zone indicators @@ -79,7 +77,7 @@ * @inheritable * @property {string[]} */ - mw.widgets.datetime.DateTimeFormatter[ 'static' ].fullZones = null; + mw.widgets.datetime.DateTimeFormatter.static.fullZones = null; /** * Default abbreviated time zone indicators @@ -88,9 +86,9 @@ * @inheritable * @property {string[]} */ - mw.widgets.datetime.DateTimeFormatter[ 'static' ].shortZones = null; + mw.widgets.datetime.DateTimeFormatter.static.shortZones = null; - mw.widgets.datetime.DateTimeFormatter[ 'static' ].setupDefaults = function () { + mw.widgets.datetime.DateTimeFormatter.static.setupDefaults = function () { if ( !this.fullZones ) { this.fullZones = [ mw.msg( 'timezone-utc' ), @@ -127,6 +125,7 @@ return this.local; }; + // eslint-disable-next-line valid-jsdoc /** * Toggle whether dates are in local time or UTC * @@ -464,7 +463,7 @@ * - 'clip': "Jan 32" => "Jan 31", "Feb 32" => "Feb 28" (or 29), "Feb 0" => "Feb 1", etc. * @return {Date} Adjusted date */ - mw.widgets.datetime.DateTimeFormatter.prototype.adjustComponent = function ( date /*, component, delta, mode */ ) { + mw.widgets.datetime.DateTimeFormatter.prototype.adjustComponent = function ( date /* , component, delta, mode */ ) { // Should be overridden by subclass return date; }; diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js index 01d3442798..e9bedf5b32 100644 --- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js +++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js @@ -51,6 +51,11 @@ calendar: {} }, config ); + // See InputWidget#reusePreInfuseDOM about config.$input + if ( config.$input ) { + config.$input.addClass( 'oo-ui-element-hidden' ); + } + if ( $.isPlainObject( config.formatter ) && config.formatter.format === undefined ) { config.formatter.format = '@' + config.type; } @@ -172,7 +177,7 @@ /* Static properties */ - mw.widgets.datetime.DateTimeInputWidget[ 'static' ].supportsSimpleLabel = false; + mw.widgets.datetime.DateTimeInputWidget.static.supportsSimpleLabel = false; /* Events */ @@ -578,6 +583,7 @@ * @private * @param {jQuery} $field * @param {jQuery.Event} e Key down event + * @return {boolean} False to cancel the default event */ mw.widgets.datetime.DateTimeInputWidget.prototype.onFieldKeyDown = function ( $field, e ) { var spec = $field.data( 'mw-widgets-datetime-dateTimeInputWidget-fieldSpec' ); @@ -699,6 +705,7 @@ * @private * @param {jQuery} $field * @param {jQuery.Event} e Change event + * @return {boolean} False to cancel the default event */ mw.widgets.datetime.DateTimeInputWidget.prototype.onFieldWheel = function ( $field, e ) { var delta = 0, diff --git a/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js index fbf323844b..b280eadc03 100644 --- a/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js +++ b/resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js @@ -32,7 +32,7 @@ /** * @inheritdoc */ - mw.widgets.datetime.DiscordianDateTimeFormatter[ 'static' ].formats = { + mw.widgets.datetime.DiscordianDateTimeFormatter.static.formats = { '@time': '${hour|0}:${minute|0}:${second|0}', '@date': '$!{dow|full}${not-intercalary|1|, }${season|full}${not-intercalary|1| }${day|#}, ${year|#}', '@datetime': '$!{dow|full}${not-intercalary|1|, }${season|full}${not-intercalary|1| }${day|#}, ${year|#} ${hour|0}:${minute|0}:${second|0} $!{zone|short}', diff --git a/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js b/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js index f60b34bdcc..9e9b15ff26 100644 --- a/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js +++ b/resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js @@ -26,13 +26,11 @@ * @cfg {number} [weekStartsOn=0] What day the week starts on: 0 is Sunday, 1 is Monday, 6 is Saturday. */ mw.widgets.datetime.ProlepticGregorianDateTimeFormatter = function MwWidgetsDatetimeProlepticGregorianDateTimeFormatter( config ) { - var statick = this.constructor[ 'static' ]; - - statick.setupDefaults(); + this.constructor.static.setupDefaults(); config = $.extend( { weekStartsOn: 0, - hour12Periods: statick.hour12Periods + hour12Periods: this.constructor.static.hour12Periods }, config ); if ( config.fullMonthNames && !config.shortMonthNames ) { @@ -60,11 +58,11 @@ }.bind( this ) ); } config = $.extend( { - fullMonthNames: statick.fullMonthNames, - shortMonthNames: statick.shortMonthNames, - fullDayNames: statick.fullDayNames, - shortDayNames: statick.shortDayNames, - dayLetters: statick.dayLetters + fullMonthNames: this.constructor.static.fullMonthNames, + shortMonthNames: this.constructor.static.shortMonthNames, + fullDayNames: this.constructor.static.fullDayNames, + shortDayNames: this.constructor.static.shortDayNames, + dayLetters: this.constructor.static.dayLetters }, config ); // Parent constructor @@ -89,7 +87,7 @@ /** * @inheritdoc */ - mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'static' ].formats = { + mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.static.formats = { '@time': '${hour|0}:${minute|0}:${second|0}', '@date': '$!{dow|short} ${day|#} ${month|short} ${year|#}', '@datetime': '$!{dow|short} ${day|#} ${month|short} ${year|#} ${hour|0}:${minute|0}:${second|0} $!{zone|short}', @@ -103,7 +101,7 @@ * @inheritable * @property {Object} */ - mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'static' ].fullMonthNames = null; + mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.static.fullMonthNames = null; /** * Default abbreviated month names. @@ -112,7 +110,7 @@ * @inheritable * @property {Object} */ - mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'static' ].shortMonthNames = null; + mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.static.shortMonthNames = null; /** * Default full day of week names. @@ -121,7 +119,7 @@ * @inheritable * @property {Object} */ - mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'static' ].fullDayNames = null; + mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.static.fullDayNames = null; /** * Default abbreviated day of week names. @@ -130,7 +128,7 @@ * @inheritable * @property {Object} */ - mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'static' ].shortDayNames = null; + mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.static.shortDayNames = null; /** * Default day letters. @@ -139,7 +137,7 @@ * @inheritable * @property {string[]} */ - mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'static' ].dayLetters = null; + mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.static.dayLetters = null; /** * Default AM/PM indicators @@ -148,10 +146,10 @@ * @inheritable * @property {string[]} */ - mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'static' ].hour12Periods = null; + mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.static.hour12Periods = null; - mw.widgets.datetime.ProlepticGregorianDateTimeFormatter[ 'static' ].setupDefaults = function () { - mw.widgets.datetime.DateTimeFormatter[ 'static' ].setupDefaults.call( this ); + mw.widgets.datetime.ProlepticGregorianDateTimeFormatter.static.setupDefaults = function () { + mw.widgets.datetime.DateTimeFormatter.static.setupDefaults.call( this ); if ( this.fullMonthNames && !this.shortMonthNames ) { this.shortMonthNames = {}; diff --git a/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less b/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less index 84c086fff5..bdade364e7 100644 --- a/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less +++ b/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less @@ -34,4 +34,4 @@ @indicator-size: unit( 12 / 16 / 0.8, em ); @icon-size: unit( 24 / 16 / 0.8, em ); @quick-ease: 100ms ease; -@progressive: #347bff; +@progressive: #36c; diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js index 3daa70ace0..57a3d9c0bc 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js @@ -4,7 +4,7 @@ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt * @license The MIT License (MIT); see LICENSE.txt */ -/*global moment */ +/* global moment */ ( function ( $, mw ) { /** @@ -175,87 +175,87 @@ selected = moment( this.getDate(), this.getDateFormat() ); switch ( this.displayLayer ) { - case 'month': - this.labelButton.setLabel( this.moment.format( 'MMMM YYYY' ) ); - this.upButton.toggle( true ); - - // First week displayed is the first week spanned by the month, unless it begins on Monday, in - // which case first week displayed is the previous week. This makes the calendar "balanced" - // and also neatly handles 28-day February sometimes spanning only 4 weeks. - currentDay = moment( this.moment ).startOf( 'month' ).subtract( 1, 'day' ).startOf( 'week' ); - - // Day-of-week labels. Localisation-independent: works with weeks starting on Saturday, Sunday - // or Monday. - for ( i = 0; i < 7; i++ ) { - items.push( - $( '

' ) - .addClass( 'mw-widget-calendarWidget-day-heading' ) - .text( currentDay.format( 'dd' ) ) - ); - currentDay.add( 1, 'day' ); - } - currentDay.subtract( 7, 'days' ); - - // Actual calendar month. Always displays 6 weeks, for consistency (months can span 4 to 6 - // weeks). - for ( i = 0; i < 42; i++ ) { - items.push( - $( '

' ) - .addClass( 'mw-widget-calendarWidget-item mw-widget-calendarWidget-day' ) - .toggleClass( 'mw-widget-calendarWidget-day-additional', !currentDay.isSame( this.moment, 'month' ) ) - .toggleClass( 'mw-widget-calendarWidget-day-today', currentDay.isSame( today, 'day' ) ) - .toggleClass( 'mw-widget-calendarWidget-item-selected', currentDay.isSame( selected, 'day' ) ) - .text( currentDay.format( 'D' ) ) - .data( 'date', currentDay.date() ) - .data( 'month', currentDay.month() ) - .data( 'year', currentDay.year() ) - ); - currentDay.add( 1, 'day' ); - } - break; - - case 'year': - this.labelButton.setLabel( this.moment.format( 'YYYY' ) ); - this.upButton.toggle( true ); - - currentMonth = moment( this.moment ).startOf( 'year' ); - for ( i = 0; i < 12; i++ ) { - items.push( - $( '

' ) - .addClass( 'mw-widget-calendarWidget-item mw-widget-calendarWidget-month' ) - .toggleClass( 'mw-widget-calendarWidget-item-selected', currentMonth.isSame( selected, 'month' ) ) - .text( currentMonth.format( 'MMMM' ) ) - .data( 'month', currentMonth.month() ) - ); - currentMonth.add( 1, 'month' ); - } - // Shuffle the array to display months in columns rather than rows. - items = [ - items[ 0 ], items[ 6 ], // | January | July | - items[ 1 ], items[ 7 ], // | February | August | - items[ 2 ], items[ 8 ], // | March | September | - items[ 3 ], items[ 9 ], // | April | October | - items[ 4 ], items[ 10 ], // | May | November | - items[ 5 ], items[ 11 ] // | June | December | - ]; - break; - - case 'duodecade': - this.labelButton.setLabel( null ); - this.upButton.toggle( false ); - - currentYear = moment( { year: Math.floor( this.moment.year() / 20 ) * 20 } ); - for ( i = 0; i < 20; i++ ) { - items.push( - $( '

' ) - .addClass( 'mw-widget-calendarWidget-item mw-widget-calendarWidget-year' ) - .toggleClass( 'mw-widget-calendarWidget-item-selected', currentYear.isSame( selected, 'year' ) ) - .text( currentYear.format( 'YYYY' ) ) - .data( 'year', currentYear.year() ) - ); - currentYear.add( 1, 'year' ); - } - break; + case 'month': + this.labelButton.setLabel( this.moment.format( 'MMMM YYYY' ) ); + this.upButton.toggle( true ); + + // First week displayed is the first week spanned by the month, unless it begins on Monday, in + // which case first week displayed is the previous week. This makes the calendar "balanced" + // and also neatly handles 28-day February sometimes spanning only 4 weeks. + currentDay = moment( this.moment ).startOf( 'month' ).subtract( 1, 'day' ).startOf( 'week' ); + + // Day-of-week labels. Localisation-independent: works with weeks starting on Saturday, Sunday + // or Monday. + for ( i = 0; i < 7; i++ ) { + items.push( + $( '

' ) + .addClass( 'mw-widget-calendarWidget-day-heading' ) + .text( currentDay.format( 'dd' ) ) + ); + currentDay.add( 1, 'day' ); + } + currentDay.subtract( 7, 'days' ); + + // Actual calendar month. Always displays 6 weeks, for consistency (months can span 4 to 6 + // weeks). + for ( i = 0; i < 42; i++ ) { + items.push( + $( '

' ) + .addClass( 'mw-widget-calendarWidget-item mw-widget-calendarWidget-day' ) + .toggleClass( 'mw-widget-calendarWidget-day-additional', !currentDay.isSame( this.moment, 'month' ) ) + .toggleClass( 'mw-widget-calendarWidget-day-today', currentDay.isSame( today, 'day' ) ) + .toggleClass( 'mw-widget-calendarWidget-item-selected', currentDay.isSame( selected, 'day' ) ) + .text( currentDay.format( 'D' ) ) + .data( 'date', currentDay.date() ) + .data( 'month', currentDay.month() ) + .data( 'year', currentDay.year() ) + ); + currentDay.add( 1, 'day' ); + } + break; + + case 'year': + this.labelButton.setLabel( this.moment.format( 'YYYY' ) ); + this.upButton.toggle( true ); + + currentMonth = moment( this.moment ).startOf( 'year' ); + for ( i = 0; i < 12; i++ ) { + items.push( + $( '

' ) + .addClass( 'mw-widget-calendarWidget-item mw-widget-calendarWidget-month' ) + .toggleClass( 'mw-widget-calendarWidget-item-selected', currentMonth.isSame( selected, 'month' ) ) + .text( currentMonth.format( 'MMMM' ) ) + .data( 'month', currentMonth.month() ) + ); + currentMonth.add( 1, 'month' ); + } + // Shuffle the array to display months in columns rather than rows. + items = [ + items[ 0 ], items[ 6 ], // | January | July | + items[ 1 ], items[ 7 ], // | February | August | + items[ 2 ], items[ 8 ], // | March | September | + items[ 3 ], items[ 9 ], // | April | October | + items[ 4 ], items[ 10 ], // | May | November | + items[ 5 ], items[ 11 ] // | June | December | + ]; + break; + + case 'duodecade': + this.labelButton.setLabel( null ); + this.upButton.toggle( false ); + + currentYear = moment( { year: Math.floor( this.moment.year() / 20 ) * 20 } ); + for ( i = 0; i < 20; i++ ) { + items.push( + $( '

' ) + .addClass( 'mw-widget-calendarWidget-item mw-widget-calendarWidget-year' ) + .toggleClass( 'mw-widget-calendarWidget-item-selected', currentYear.isSame( selected, 'year' ) ) + .text( currentYear.format( 'YYYY' ) ) + .data( 'year', currentYear.year() ) + ); + currentYear.add( 1, 'year' ); + } + break; } this.$body.append.apply( this.$body, items ); @@ -369,15 +369,15 @@ */ mw.widgets.CalendarWidget.prototype.onPrevButtonClick = function () { switch ( this.displayLayer ) { - case 'month': - this.moment.subtract( 1, 'month' ); - break; - case 'year': - this.moment.subtract( 1, 'year' ); - break; - case 'duodecade': - this.moment.subtract( 20, 'years' ); - break; + case 'month': + this.moment.subtract( 1, 'month' ); + break; + case 'year': + this.moment.subtract( 1, 'year' ); + break; + case 'duodecade': + this.moment.subtract( 20, 'years' ); + break; } this.updateUI( 'previous' ); }; @@ -389,15 +389,15 @@ */ mw.widgets.CalendarWidget.prototype.onNextButtonClick = function () { switch ( this.displayLayer ) { - case 'month': - this.moment.add( 1, 'month' ); - break; - case 'year': - this.moment.add( 1, 'year' ); - break; - case 'duodecade': - this.moment.add( 20, 'years' ); - break; + case 'month': + this.moment.add( 1, 'month' ); + break; + case 'year': + this.moment.add( 1, 'year' ); + break; + case 'duodecade': + this.moment.add( 20, 'years' ); + break; } this.updateUI( 'next' ); }; @@ -408,6 +408,7 @@ * what gets clicked. * * @private + * @param {jQuery.Event} e Click event */ mw.widgets.CalendarWidget.prototype.onBodyClick = function ( e ) { var @@ -504,6 +505,7 @@ * * @private * @param {jQuery.Event} e Mouse click event + * @return {boolean} False to cancel the default event */ mw.widgets.CalendarWidget.prototype.onClick = function ( e ) { if ( !this.isDisabled() && e.which === 1 ) { @@ -517,39 +519,38 @@ * * @private * @param {jQuery.Event} e Key down event + * @return {boolean} False to cancel the default event */ mw.widgets.CalendarWidget.prototype.onKeyDown = function ( e ) { var - /*jshint -W024*/ dir = OO.ui.Element.static.getDir( this.$element ), - /*jshint +W024*/ nextDirectionKey = dir === 'ltr' ? OO.ui.Keys.RIGHT : OO.ui.Keys.LEFT, prevDirectionKey = dir === 'ltr' ? OO.ui.Keys.LEFT : OO.ui.Keys.RIGHT, changed = true; if ( !this.isDisabled() ) { switch ( e.which ) { - case prevDirectionKey: - this.moment.subtract( 1, this.precision === 'month' ? 'month' : 'day' ); - break; - case nextDirectionKey: - this.moment.add( 1, this.precision === 'month' ? 'month' : 'day' ); - break; - case OO.ui.Keys.UP: - this.moment.subtract( 1, this.precision === 'month' ? 'month' : 'week' ); - break; - case OO.ui.Keys.DOWN: - this.moment.add( 1, this.precision === 'month' ? 'month' : 'week' ); - break; - case OO.ui.Keys.PAGEUP: - this.moment.subtract( 1, this.precision === 'month' ? 'year' : 'month' ); - break; - case OO.ui.Keys.PAGEDOWN: - this.moment.add( 1, this.precision === 'month' ? 'year' : 'month' ); - break; - default: - changed = false; - break; + case prevDirectionKey: + this.moment.subtract( 1, this.precision === 'month' ? 'month' : 'day' ); + break; + case nextDirectionKey: + this.moment.add( 1, this.precision === 'month' ? 'month' : 'day' ); + break; + case OO.ui.Keys.UP: + this.moment.subtract( 1, this.precision === 'month' ? 'month' : 'week' ); + break; + case OO.ui.Keys.DOWN: + this.moment.add( 1, this.precision === 'month' ? 'month' : 'week' ); + break; + case OO.ui.Keys.PAGEUP: + this.moment.subtract( 1, this.precision === 'month' ? 'year' : 'month' ); + break; + case OO.ui.Keys.PAGEDOWN: + this.moment.add( 1, this.precision === 'month' ? 'year' : 'month' ); + break; + default: + changed = false; + break; } if ( changed ) { diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less index 9d30eb8a1f..4d904964ec 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less +++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less @@ -212,7 +212,7 @@ .mw-widget-calendarWidget:focus { outline: none; - box-shadow: inset 0 0 0 2px #347bff; + box-shadow: inset 0 0 0 2px #36c; } .mw-widget-calendarWidget-day { diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js index 946823d119..488d9e099f 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js @@ -52,13 +52,21 @@ prop: [ 'info' ], titles: titles } ).done( function ( response ) { + var + normalized = {}, + pages = {}; + $.each( response.query.normalized || [], function ( index, data ) { + normalized[ data.fromencoded ? decodeURIComponent( data.from ) : data.from ] = data.to; + } ); $.each( response.query.pages, function ( index, page ) { - var title = new ForeignTitle( page.title ).getPrefixedText(); - cache.existenceCache[ title ] = !page.missing; - if ( !queue[ title ] ) { - // Debugging for T139130 - throw new Error( 'No queue for "' + title + '", requested "' + titles.join( '|' ) + '"' ); + pages[ page.title ] = !page.missing; + } ); + $.each( titles, function ( index, title ) { + var normalizedTitle = title; + while ( normalized[ normalizedTitle ] ) { + normalizedTitle = normalized[ normalizedTitle ]; } + cache.existenceCache[ title ] = pages[ normalizedTitle ]; queue[ title ].resolve( cache.existenceCache[ title ] ); } ); } ); @@ -86,7 +94,8 @@ * @extends mw.Title * * @constructor - * @inheritdoc + * @param {string} title + * @param {number} [namespace] */ function ForeignTitle( title, namespace ) { // We only need to handle categories here... but we don't know the target language. @@ -101,11 +110,10 @@ }; /** - * @class mw.widgets.CategoryCapsuleItemWidget - * * Category selector capsule item widget. Extends OO.ui.CapsuleItemWidget with the ability to link * to the given page, and to show its existence status (i.e., whether it is a redlink). * + * @class mw.widgets.CategoryCapsuleItemWidget * @uses mw.Api * @extends OO.ui.CapsuleItemWidget * @@ -138,7 +146,6 @@ this.$label.replaceWith( this.$link ); this.setLabelElement( this.$link ); - /*jshint -W024*/ if ( !this.constructor.static.pageExistenceCaches[ this.apiUrl ] ) { this.constructor.static.pageExistenceCaches[ this.apiUrl ] = new PageExistenceCache( new mw.ForeignApi( this.apiUrl ) ); @@ -148,7 +155,6 @@ .done( function ( exists ) { widget.setMissing( !exists ); } ); - /*jshint +W024*/ }; /* Setup */ @@ -157,7 +163,6 @@ /* Static Properties */ - /*jshint -W024*/ /** * Map of API URLs to PageExistenceCache objects. * @@ -168,7 +173,6 @@ mw.widgets.CategoryCapsuleItemWidget.static.pageExistenceCaches = { '': new PageExistenceCache() }; - /*jshint +W024*/ /* Methods */ diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js b/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js index ffb7736470..422c048e76 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js @@ -12,16 +12,18 @@ * Category selector widget. Displays an OO.ui.CapsuleMultiselectWidget * and autocompletes with available categories. * - * var selector = new mw.widgets.CategorySelector( { - * searchTypes: [ - * mw.widgets.CategorySelector.SearchType.OpenSearch, - * mw.widgets.CategorySelector.SearchType.InternalSearch - * ] - * } ); + * mw.loader.using( 'mediawiki.widgets.CategorySelector', function () { + * var selector = new mw.widgets.CategorySelector( { + * searchTypes: [ + * mw.widgets.CategorySelector.SearchType.OpenSearch, + * mw.widgets.CategorySelector.SearchType.InternalSearch + * ] + * } ); * - * $( '#content' ).append( selector.$element ); + * $( 'body' ).append( selector.$element ); * - * selector.setSearchTypes( [ mw.widgets.CategorySelector.SearchType.SubCategories ] ); + * selector.setSearchTypes( [ mw.widgets.CategorySelector.SearchType.SubCategories ] ); + * } ); * * @class mw.widgets.CategorySelector * @uses mw.Api @@ -50,6 +52,7 @@ menu: { filterFromInput: false }, + placeholder: mw.msg( 'mw-widgets-categoryselector-add-category-placeholder' ), // This allows the user to both select non-existent categories, and prevents the selector from // being wiped from #onMenuItemsChange when we change the available options in the dropdown allowArbitrary: true @@ -63,6 +66,7 @@ // Initialize this.api = config.api || new mw.Api(); + this.searchCache = {}; } /* Setup */ @@ -267,7 +271,13 @@ * @return {jQuery.Promise} Resolves with an array of categories */ CSP.searchCategories = function ( input, searchType ) { - var deferred = $.Deferred(); + var deferred = $.Deferred(), + cacheKey = input + searchType.toString(); + + // Check cache + if ( this.searchCache[ cacheKey ] !== undefined ) { + return this.searchCache[ cacheKey ]; + } switch ( searchType ) { case CategorySelector.SearchType.OpenSearch: @@ -357,16 +367,14 @@ prop: 'categories', cllimit: this.limit, titles: 'Category:' + input - } ).done( function ( res ) { + } ).done( function ( res ) { var categories = []; $.each( res.query.pages, function ( index, page ) { - if ( !page.missing ) { - if ( $.isArray( page.categories ) ) { - categories.push.apply( categories, page.categories.map( function ( category ) { - return category.title; - } ) ); - } + if ( !page.missing && $.isArray( page.categories ) ) { + categories.push.apply( categories, page.categories.map( function ( category ) { + return category.title; + } ) ); } } ); @@ -378,6 +386,9 @@ throw new Error( 'Unknown searchType' ); } + // Cache the result + this.searchCache[ cacheKey ] = deferred.promise(); + return deferred.promise(); }; diff --git a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js index ddae9b1f7f..8f48ec3d50 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js @@ -51,7 +51,6 @@ OO.inheritClass( mw.widgets.ComplexTitleInputWidget, OO.ui.Widget ); /* Static Methods */ - /*jshint -W024*/ /** * @inheritdoc @@ -85,8 +84,6 @@ return state; }; - /*jshint +W024*/ - /* Methods */ /** diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js index a9b5bc30b5..7f5e608f91 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js @@ -4,7 +4,7 @@ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt * @license The MIT License (MIT); see LICENSE.txt */ -/*global moment */ +/* global moment */ ( function ( $, mw ) { /** @@ -87,6 +87,8 @@ * calendar uses relative positioning. */ mw.widgets.DateInputWidget = function MWWDateInputWidget( config ) { + var placeholderDateFormat, mustBeAfter, mustBeBefore; + // Config initialization config = $.extend( { precision: 'day', @@ -99,7 +101,6 @@ } } - var placeholderDateFormat, mustBeAfter, mustBeBefore; if ( config.placeholderDateFormat ) { placeholderDateFormat = config.placeholderDateFormat; } else if ( config.inputFormat ) { @@ -183,6 +184,11 @@ .addClass( 'mw-widget-dateInputWidget' ) .append( this.$handle, this.textInput.$element, this.calendar.$element ); + // config.overlay is the selector to be used for config.$overlay, specified from PHP + if ( config.overlay ) { + config.$overlay = $( config.overlay ); + } + if ( config.$overlay ) { this.calendar.setFloatableContainer( this.$element ); config.$overlay.append( this.calendar.$element ); @@ -219,6 +225,12 @@ this.updateUI(); this.textInput.toggle( false ); this.calendar.toggle( false ); + + // Hide unused from PHP after infusion is done + // See InputWidget#reusePreInfuseDOM about config.$input + if ( config.$input ) { + config.$input.addClass( 'oo-ui-element-hidden' ); + } }; /* Inheritance */ @@ -401,6 +413,8 @@ * @return {string} Format string */ mw.widgets.DateInputWidget.prototype.getDisplayFormat = function () { + var localeData, llll, lll, ll, format; + if ( this.displayFormat !== undefined ) { return this.displayFormat; } @@ -419,11 +433,11 @@ // We try to construct it as 'llll - (lll - ll)' and hope for the best. // This seems to work well for many languages (maybe even all?). - var localeData = moment.localeData( moment.locale() ), - llll = localeData.longDateFormat( 'llll' ), - lll = localeData.longDateFormat( 'lll' ), - ll = localeData.longDateFormat( 'll' ), - format = llll.replace( lll.replace( ll, '' ), '' ); + localeData = moment.localeData( moment.locale() ); + llll = localeData.longDateFormat( 'llll' ); + lll = localeData.longDateFormat( 'lll' ); + ll = localeData.longDateFormat( 'll' ); + format = llll.replace( lll.replace( ll, '' ), '' ); return format; } @@ -474,6 +488,7 @@ * * @private * @param {jQuery.Event} e Mouse click event + * @return {boolean} False to cancel the default event */ mw.widgets.DateInputWidget.prototype.onClick = function ( e ) { if ( !this.isDisabled() && e.which === 1 ) { @@ -487,6 +502,7 @@ * * @private * @param {jQuery.Event} e Key press event + * @return {boolean} False to cancel the default event */ mw.widgets.DateInputWidget.prototype.onKeyPress = function ( e ) { if ( !this.isDisabled() && @@ -502,6 +518,7 @@ * * @private * @param {jQuery.Event} e Key press event + * @return {boolean} False to cancel the default event */ mw.widgets.DateInputWidget.prototype.onCalendarKeyPress = function ( e ) { if ( !this.isDisabled() && e.which === OO.ui.Keys.ENTER ) { @@ -516,6 +533,7 @@ * * @private * @param {jQuery.Event} e Mouse click event + * @return {boolean} False to cancel the default event */ mw.widgets.DateInputWidget.prototype.onCalendarClick = function ( e ) { if ( diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less index 86018a4498..46e6b62ac7 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less +++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less @@ -105,7 +105,7 @@ &.oo-ui-widget-enabled { .mw-widget-dateInputWidget-handle:hover { - border-color: #347bff; + border-color: #36c; } } diff --git a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js index c88395e13f..aa0c739f5e 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js @@ -36,6 +36,8 @@ /** * @private + * @param {Object} [config] Configuration options + * @return {Object[]} Dropdown options */ mw.widgets.NamespaceInputWidget.prototype.getNamespaceDropdownOptions = function ( config ) { var options, diff --git a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js index d816335e72..39bee7c119 100755 --- a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js @@ -13,6 +13,7 @@ * @extends mw.widgets.TitleInputWidget * * @constructor + * @param {Object} [config] Configuration options * @cfg {boolean} [pushPending=true] Visually mark the input field as "pending", while * requesting suggestions. * @cfg {boolean} [performSearchOnClick=true] If true, the script will start a search when- diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js index 101a6060d2..a78ad82b4a 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js @@ -15,6 +15,7 @@ * @mixins OO.ui.mixin.LookupElement * * @constructor + * @param {Object} [config] Configuration options * @cfg {boolean} [suggestions=true] Display search suggestions * @cfg {RegExp|Function|string} [validate] Perform title validation */ diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js index 96f95491eb..5ba9481a0c 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleSearchWidget.js @@ -15,6 +15,7 @@ * @mixins mw.widgets.TitleWidget * * @constructor + * @param {Object} [config] Configuration options */ mw.widgets.TitleSearchWidget = function MwWidgetsTitleSearchWidget( config ) { config = config || {}; diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js index 17324076c3..e1e50ea17a 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js @@ -7,14 +7,14 @@ ( function ( $, mw ) { var interwikiPrefixesPromise = new mw.Api().get( { - action: 'query', - meta: 'siteinfo', - siprop: 'interwikimap' - } ).then( function ( data ) { - return $.map( data.query.interwikimap, function ( interwiki ) { - return interwiki.prefix; - } ); + action: 'query', + meta: 'siteinfo', + siprop: 'interwikimap' + } ).then( function ( data ) { + return $.map( data.query.interwikimap, function ( interwiki ) { + return interwiki.prefix; } ); + } ); /** * Mixin for title widgets @@ -30,9 +30,9 @@ * @cfg {boolean} [relative=true] If a namespace is set, display titles relative to it * @cfg {boolean} [suggestions=true] Display search suggestions * @cfg {boolean} [showRedirectTargets=true] Show the targets of redirects - * @cfg {boolean} [showRedlink] Show red link to exact match if it doesn't exist * @cfg {boolean} [showImages] Show page images * @cfg {boolean} [showDescriptions] Show page descriptions + * @cfg {boolean} [excludeCurrentPage] Exclude the current page from suggestions * @cfg {boolean} [validateTitle=true] Whether the input must be a valid title (if set to true, * the widget will marks itself red for invalid inputs, including an empty query). * @cfg {Object} [cache] Result cache which implements a 'set' method, taking keyed values as an argument @@ -51,9 +51,9 @@ this.relative = config.relative !== undefined ? config.relative : true; this.suggestions = config.suggestions !== undefined ? config.suggestions : true; this.showRedirectTargets = config.showRedirectTargets !== false; - this.showRedlink = !!config.showRedlink; this.showImages = !!config.showImages; this.showDescriptions = !!config.showDescriptions; + this.excludeCurrentPage = !!config.excludeCurrentPage; this.validateTitle = config.validateTitle !== undefined ? config.validateTitle : true; this.cache = config.cache; @@ -144,7 +144,13 @@ } req = new mw.Api().get( params ); promiseAbortObject.abort = req.abort.bind( req ); // TODO ew - return req; + return req.then( function ( ret ) { + if ( ret.query === undefined ) { + ret = new mw.Api().get( { action: 'query', titles: query } ); + promiseAbortObject.abort = ret.abort.bind( ret ); + } + return ret; + } ); } } ).promise( promiseAbortObject ); } else { @@ -162,6 +168,7 @@ */ mw.widgets.TitleWidget.prototype.getOptionsFromData = function ( data ) { var i, len, index, pageExists, pageExistsExact, suggestionPage, page, redirect, redirects, + currentPageName = new mw.Title( mw.config.get( 'wgRelevantPageName' ) ).getPrefixedText(), items = [], titles = [], titleObj = mw.Title.newFromText( this.getQueryValue() ), @@ -178,7 +185,12 @@ for ( index in data.pages ) { suggestionPage = data.pages[ index ]; + // When excludeCurrentPage is set, don't list the current page unless the user has type the full title + if ( this.excludeCurrentPage && suggestionPage.title === currentPageName && suggestionPage.title !== titleObj.getPrefixedText() ) { + continue; + } pageData[ suggestionPage.title ] = { + known: suggestionPage.known !== undefined, missing: suggestionPage.missing !== undefined, redirect: suggestionPage.redirect !== undefined, disambiguation: OO.getProp( suggestionPage, 'pageprops', 'disambiguation' ) !== undefined, @@ -198,6 +210,7 @@ for ( i = 0, len = redirects.length; i < len; i++ ) { pageData[ redirects[ i ] ] = { missing: false, + known: true, redirect: true, disambiguation: false, description: mw.msg( 'mw-widgets-titleinput-description-redirect', suggestionPage.title ), @@ -215,18 +228,22 @@ // If not found, run value through mw.Title to avoid treating a match as a // mismatch where normalisation would make them matching (bug 48476) - pageExistsExact = titles.indexOf( this.getQueryValue() ) !== -1; + pageExistsExact = ( + Object.prototype.hasOwnProperty.call( pageData, this.getQueryValue() ) && + ( + !pageData[ this.getQueryValue() ].missing || + pageData[ this.getQueryValue() ].known + ) + ); pageExists = pageExistsExact || ( - titleObj && titles.indexOf( titleObj.getPrefixedText() ) !== -1 + titleObj && + Object.prototype.hasOwnProperty.call( pageData, titleObj.getPrefixedText() ) && + ( + !pageData[ titleObj.getPrefixedText() ].missing || + pageData[ titleObj.getPrefixedText() ].known + ) ); - if ( !pageExists ) { - pageData[ this.getQueryValue() ] = { - missing: true, redirect: false, disambiguation: false, - description: mw.msg( 'mw-widgets-titleinput-description-new-page' ) - }; - } - if ( this.cache ) { this.cache.set( pageData ); } @@ -235,10 +252,7 @@ if ( pageExists && !pageExistsExact ) { titles.unshift( this.getQueryValue() ); } - // Offer the exact text as a new page if the title is valid - if ( this.showRedlink && !pageExists && titleObj ) { - titles.push( this.getQueryValue() ); - } + for ( i = 0, len = titles.length; i < len; i++ ) { page = pageData[ titles[ i ] ] || {}; items.push( new mw.widgets.TitleOptionWidget( this.getOptionWidgetData( titles[ i ], page ) ) ); @@ -255,14 +269,18 @@ * @return {Object} Data for option widget */ mw.widgets.TitleWidget.prototype.getOptionWidgetData = function ( title, data ) { - var mwTitle = new mw.Title( title ); + var mwTitle = new mw.Title( title ), + description = data.description; + if ( data.missing && !description ) { + description = mw.msg( 'mw-widgets-titleinput-description-new-page' ); + } return { - data: this.namespace !== null && this.relative - ? mwTitle.getRelativeText( this.namespace ) - : title, + data: this.namespace !== null && this.relative ? + mwTitle.getRelativeText( this.namespace ) : + title, url: mwTitle.getUrl(), imageUrl: this.showImages ? data.imageUrl : null, - description: this.showDescriptions ? data.description : null, + description: this.showDescriptions ? description : null, missing: data.missing, redirect: data.redirect, disambiguation: data.disambiguation, diff --git a/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js index 164fd20d0a..2b3a59f5c0 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js @@ -90,6 +90,7 @@ * * @method * @param {Mixed} response Response from server + * @return {Object} */ mw.widgets.UserInputWidget.prototype.getLookupCacheDataFromResponse = function ( response ) { return response.query.allusers || {}; diff --git a/resources/src/mediawiki/ForeignApi.js b/resources/src/mediawiki/ForeignApi.js index 899daa57a4..1a3cdd5a3f 100644 --- a/resources/src/mediawiki/ForeignApi.js +++ b/resources/src/mediawiki/ForeignApi.js @@ -35,6 +35,9 @@ * @constructor * @param {string|mw.Uri} url URL pointing to another wiki's `api.php` endpoint. * @param {Object} [options] See mw.Api. + * @param {Object} [options.anonymous=false] Perform all requests anonymously. Use this option if + * the target wiki may otherwise not accept cross-origin requests, or if you don't need to + * perform write actions or read restricted information and want to avoid the overhead. * * @author Bartosz DziewoÅski * @author Jon Robson @@ -45,13 +48,14 @@ } this.apiUrl = String( url ); + this.anonymous = options && options.anonymous; - options = $.extend( /*deep=*/ true, + options = $.extend( /* deep=*/ true, { ajax: { url: this.apiUrl, xhrFields: { - withCredentials: true + withCredentials: !this.anonymous } }, parameters: { @@ -76,7 +80,11 @@ * @return {string} */ CoreForeignApi.prototype.getOrigin = function () { - var origin = location.protocol + '//' + location.hostname; + var origin; + if ( this.anonymous ) { + return '*'; + } + origin = location.protocol + '//' + location.hostname; if ( location.port ) { origin += ':' + location.port; } diff --git a/resources/src/mediawiki/api.js b/resources/src/mediawiki/api.js index a8ee4c7a82..b9e05c368f 100644 --- a/resources/src/mediawiki/api.js +++ b/resources/src/mediawiki/api.js @@ -9,6 +9,9 @@ * `options` to mw.Api constructor. * @property {Object} defaultOptions.parameters Default query parameters for API requests. * @property {Object} defaultOptions.ajax Default options for jQuery#ajax. + * @property {boolean} defaultOptions.useUS Whether to use U+001F when joining multi-valued + * parameters (since 1.28). Default is true if ajax.url is not set, false otherwise for + * compatibility. * @private */ var defaultOptions = { @@ -95,6 +98,8 @@ options.ajax.url = String( options.ajax.url ); } + options = $.extend( { useUS: !options.ajax || !options.ajax.url }, options ); + options.parameters = $.extend( {}, defaultOptions.parameters, options.parameters ); options.ajax = $.extend( {}, defaultOptions.ajax, options.ajax ); @@ -147,14 +152,19 @@ * * @private * @param {Object} parameters (modified in-place) + * @param {boolean} useUS Whether to use U+001F when joining multi-valued parameters. */ - preprocessParameters: function ( parameters ) { + preprocessParameters: function ( parameters, useUS ) { var key; // Handle common MediaWiki API idioms for passing parameters for ( key in parameters ) { // Multiple values are pipe-separated if ( $.isArray( parameters[ key ] ) ) { - parameters[ key ] = parameters[ key ].join( '|' ); + if ( !useUS || parameters[ key ].join( '' ).indexOf( '|' ) === -1 ) { + parameters[ key ] = parameters[ key ].join( '|' ); + } else { + parameters[ key ] = '\x1f' + parameters[ key ].join( '\x1f' ); + } } // Boolean values are only false when not given at all if ( parameters[ key ] === false || parameters[ key ] === undefined ) { @@ -186,7 +196,7 @@ delete parameters.token; } - this.preprocessParameters( parameters ); + this.preprocessParameters( parameters, this.defaults.useUS ); // If multipart/form-data has been requested and emulation is possible, emulate it if ( @@ -243,6 +253,7 @@ } ) // AJAX success just means "200 OK" response, also check API error codes .done( function ( result, textStatus, jqXHR ) { + var code; if ( result === undefined || result === null || result === '' ) { apiDeferred.reject( 'ok-but-empty', 'OK response but empty result (check HTTP headers?)', @@ -250,7 +261,7 @@ jqXHR ); } else if ( result.error ) { - var code = result.error.code === undefined ? 'unknown' : result.error.code; + code = result.error.code === undefined ? 'unknown' : result.error.code; apiDeferred.reject( code, result, result, jqXHR ); } else { apiDeferred.resolve( result, jqXHR ); @@ -343,6 +354,7 @@ * * @since 1.22 * @param {string} type Token type + * @param {string} [assert] * @return {jQuery.Promise} Received token. */ getToken: function ( type, assert ) { diff --git a/resources/src/mediawiki/api/edit.js b/resources/src/mediawiki/api/edit.js index bb3a913f06..21fad5e573 100644 --- a/resources/src/mediawiki/api/edit.js +++ b/resources/src/mediawiki/api/edit.js @@ -121,13 +121,13 @@ var basetimestamp, curtimestamp, api = this; return api.get( { - action: 'query', - prop: 'revisions', - rvprop: [ 'content', 'timestamp' ], - titles: String( title ), - formatversion: '2', - curtimestamp: true - } ) + action: 'query', + prop: 'revisions', + rvprop: [ 'content', 'timestamp' ], + titles: String( title ), + formatversion: '2', + curtimestamp: true + } ) .then( function ( data ) { var page, revision; if ( !data.query || !data.query.pages ) { diff --git a/resources/src/mediawiki/api/messages.js b/resources/src/mediawiki/api/messages.js index 9ba562e266..a1a499960f 100644 --- a/resources/src/mediawiki/api/messages.js +++ b/resources/src/mediawiki/api/messages.js @@ -14,16 +14,18 @@ * Get a set of messages. * * @param {Array} messages Messages to retrieve + * @param {Object} [options] Additional parameters for the API call * @return {jQuery.Promise} */ - getMessages: function ( messages ) { - return this.get( { + getMessages: function ( messages, options ) { + options = options || {}; + return this.get( $.extend( { action: 'query', meta: 'allmessages', ammessages: messages, amlang: mw.config.get( 'wgUserLanguage' ), formatversion: 2 - } ).then( function ( data ) { + }, options ) ).then( function ( data ) { var result = {}; $.each( data.query.allmessages, function ( i, obj ) { @@ -37,23 +39,25 @@ }, /** - * Loads a set of mesages and add them to mw.messages. + * Loads a set of messages and add them to mw.messages. * * @param {Array} messages Messages to retrieve + * @param {Object} [options] Additional parameters for the API call * @return {jQuery.Promise} */ - loadMessages: function ( messages ) { - return this.getMessages( messages ).then( $.proxy( mw.messages, 'set' ) ); + loadMessages: function ( messages, options ) { + return this.getMessages( messages, options ).then( $.proxy( mw.messages, 'set' ) ); }, /** - * Loads a set of mesages and add them to mw.messages. Only messages that are not already known + * Loads a set of messages and add them to mw.messages. Only messages that are not already known * are loaded. If all messages are known, the returned promise is resolved immediately. * * @param {Array} messages Messages to retrieve + * @param {Object} [options] Additional parameters for the API call * @return {jQuery.Promise} */ - loadMessagesIfMissing: function ( messages ) { + loadMessagesIfMissing: function ( messages, options ) { var missing = messages.filter( function ( msg ) { return !mw.message( msg ).exists(); } ); @@ -62,7 +66,7 @@ return $.Deferred().resolve(); } - return this.getMessages( missing ).then( $.proxy( mw.messages, 'set' ) ); + return this.getMessages( missing, options ).then( $.proxy( mw.messages, 'set' ) ); } } ); diff --git a/resources/src/mediawiki/api/options.js b/resources/src/mediawiki/api/options.js index 0af2a754b7..069fbbfcda 100644 --- a/resources/src/mediawiki/api/options.js +++ b/resources/src/mediawiki/api/options.js @@ -41,9 +41,13 @@ value = options[ name ] === null ? null : String( options[ name ] ); // Can we bundle this option, or does it need a separate request? - bundleable = - ( value === null || value.indexOf( '|' ) === -1 ) && - ( name.indexOf( '|' ) === -1 && name.indexOf( '=' ) === -1 ); + if ( this.defaults.useUS ) { + bundleable = name.indexOf( '=' ) === -1; + } else { + bundleable = + ( value === null || value.indexOf( '|' ) === -1 ) && + ( name.indexOf( '|' ) === -1 && name.indexOf( '=' ) === -1 ); + } if ( bundleable ) { if ( value !== null ) { diff --git a/resources/src/mediawiki/api/parse.js b/resources/src/mediawiki/api/parse.js index 418fd2306f..f38e88b5c3 100644 --- a/resources/src/mediawiki/api/parse.js +++ b/resources/src/mediawiki/api/parse.js @@ -16,11 +16,12 @@ * @return {string} return.done.data Parsed HTML of `wikitext`. */ parse: function ( content, additionalParams ) { - var apiPromise, config = $.extend( { - formatversion: 2, - action: 'parse', - contentmodel: 'wikitext' - }, additionalParams ); + var apiPromise, + config = $.extend( { + formatversion: 2, + action: 'parse', + contentmodel: 'wikitext' + }, additionalParams ); if ( mw.Title && content instanceof mw.Title ) { // Parse existing page diff --git a/resources/src/mediawiki/api/rollback.js b/resources/src/mediawiki/api/rollback.js index eb2b3fc1f5..cdc4dbf018 100644 --- a/resources/src/mediawiki/api/rollback.js +++ b/resources/src/mediawiki/api/rollback.js @@ -1,6 +1,6 @@ /** * @class mw.Api.plugin.rollback - * @since 1.27 + * @since 1.28 */ ( function ( mw, $ ) { diff --git a/resources/src/mediawiki/api/upload.js b/resources/src/mediawiki/api/upload.js index c2da10e2f9..351ceb2ca3 100644 --- a/resources/src/mediawiki/api/upload.js +++ b/resources/src/mediawiki/api/upload.js @@ -34,7 +34,8 @@ * @return {string} */ function getFirstKey( obj ) { - for ( var key in obj ) { + var key; + for ( key in obj ) { if ( obj.hasOwnProperty( key ) ) { return key; } @@ -45,6 +46,7 @@ * Get new iframe object for an upload. * * @private + * @param {string} id * @return {HTMLIframeElement} */ function getNewIframe( id ) { @@ -58,6 +60,8 @@ * Shortcut for getting hidden inputs * * @private + * @param {string} name + * @param {string} val * @return {jQuery} */ function getHiddenInput( name, val ) { @@ -283,6 +287,8 @@ this[ this.needToken() ? 'postWithEditToken' : 'post' ]( data, { // Use FormData (if we got here, we know that it's available) contentType: 'multipart/form-data', + // No timeout (default from mw.Api is 30 seconds) + timeout: 0, // Provide upload progress notifications xhr: function () { var xhr = $.ajaxSettings.xhr(); @@ -371,6 +377,7 @@ * * @param {string} filekey * @param {Object} data + * @return {jQuery.Promise} */ uploadFromStash: function ( filekey, data ) { data.filekey = filekey; diff --git a/resources/src/mediawiki/api/watch.js b/resources/src/mediawiki/api/watch.js index a2ff1292bb..687b47514d 100644 --- a/resources/src/mediawiki/api/watch.js +++ b/resources/src/mediawiki/api/watch.js @@ -12,6 +12,7 @@ * @param {string|mw.Title|string[]|mw.Title[]} pages Full page name or instance of mw.Title, or an * array thereof. If an array is passed, the return value passed to the promise will also be an * array of appropriate objects. + * @param {Object} [addParams] * @return {jQuery.Promise} * @return {Function} return.done * @return {Object|Object[]} return.done.watch Object or list of objects (depends on the `pages` diff --git a/resources/src/mediawiki/htmlform/datetime.js b/resources/src/mediawiki/htmlform/datetime.js new file mode 100644 index 0000000000..2fd239696b --- /dev/null +++ b/resources/src/mediawiki/htmlform/datetime.js @@ -0,0 +1,44 @@ +/* + * HTMLForm enhancements: + * Add minimal help for date and time fields + */ +( function ( mw ) { + + mw.hook( 'htmlform.enhance' ).add( function ( $root ) { + var supported = {}; + + $root + .find( 'input.mw-htmlform-datetime-field' ) + .each( function () { + var input, + type = this.getAttribute( 'type' ); + + if ( type !== 'date' && type !== 'time' && type !== 'datetime' ) { + // WTF? + return; + } + + if ( supported[ type ] === undefined ) { + // Assume that if the browser implements validation (so it + // rejects "bogus" as a value) then it supports a proper UI too. + input = document.createElement( 'input' ); + input.setAttribute( 'type', type ); + input.value = 'bogus'; + supported[ type ] = ( input.value !== 'bogus' ); + } + + if ( supported[ type ] ) { + if ( !this.getAttribute( 'min' ) ) { + this.setAttribute( 'min', this.getAttribute( 'data-min' ) ); + } + if ( !this.getAttribute( 'max' ) ) { + this.setAttribute( 'max', this.getAttribute( 'data-max' ) ); + } + if ( !this.getAttribute( 'step' ) ) { + this.setAttribute( 'step', this.getAttribute( 'data-step' ) ); + } + } + } ); + } ); + +}( mediaWiki ) ); diff --git a/resources/src/mediawiki/htmlform/hide-if.js b/resources/src/mediawiki/htmlform/hide-if.js index cb717afad5..5f6009720a 100644 --- a/resources/src/mediawiki/htmlform/hide-if.js +++ b/resources/src/mediawiki/htmlform/hide-if.js @@ -4,8 +4,6 @@ */ ( function ( mw, $ ) { - /*jshint -W024*/ - /** * Helper function for hide-if to find the nearby form field. * @@ -156,7 +154,8 @@ } v = spec[ 2 ]; - if ( field instanceof OO.ui.Widget ) { + if ( !( field instanceof jQuery ) ) { + // field is a OO.ui.Widget if ( field.supports( 'isSelected' ) ) { getVal = function () { var selected = field.isSelected(); @@ -203,7 +202,7 @@ mw.hook( 'htmlform.enhance' ).add( function ( $root ) { $root.find( '.mw-htmlform-hide-if' ).each( function () { - var v, i, fields, test, func, spec, self, modules, data,extraModules, + var v, i, fields, test, func, spec, self, modules, data, extraModules, $el = $( this ); modules = []; diff --git a/resources/src/mediawiki/htmlform/htmlform.Element.js b/resources/src/mediawiki/htmlform/htmlform.Element.js index 37474f6833..4f672fc786 100644 --- a/resources/src/mediawiki/htmlform/htmlform.Element.js +++ b/resources/src/mediawiki/htmlform/htmlform.Element.js @@ -10,6 +10,7 @@ * Currently only supports passing 'hide-if' data. * * @ignore + * @param {Object} [config] Configuration options */ mw.htmlform.Element = function ( config ) { // Configuration initialization diff --git a/resources/src/mediawiki/htmlform/multiselect.js b/resources/src/mediawiki/htmlform/multiselect.js index a8786efa5b..37c0554acd 100644 --- a/resources/src/mediawiki/htmlform/multiselect.js +++ b/resources/src/mediawiki/htmlform/multiselect.js @@ -18,8 +18,8 @@ } ); $oldContainer.find( 'input' ).each( function () { var $oldInput = $( this ), - checked = $oldInput.prop( 'checked' ), - $option = $( '

' ); @@ -52,14 +52,61 @@ return $container; } + function convertCheckboxesWidgetToCapsules( fieldLayout ) { + var checkboxesWidget, checkboxesOptions, capsulesOptions, capsulesWidget; + + checkboxesWidget = fieldLayout.fieldWidget; + checkboxesOptions = checkboxesWidget.checkboxMultiselectWidget.getItems(); + capsulesOptions = checkboxesOptions.map( function ( option ) { + return new OO.ui.MenuOptionWidget( { + data: option.getData(), + label: option.getLabel() + } ); + } ); + capsulesWidget = new OO.ui.CapsuleMultiselectWidget( { + menu: { + items: capsulesOptions + } + } ); + capsulesWidget.setItemsFromData( checkboxesWidget.getValue() ); + + // Data from CapsuleMultiselectWidget will not be submitted with the form, so keep the original + // CheckboxMultiselectInputWidget up-to-date. + capsulesWidget.on( 'change', function () { + checkboxesWidget.setValue( capsulesWidget.getItemsData() ); + } ); + + // Hide original widget and add new one in its place. This is a bit hacky, since the FieldLayout + // still thinks it's connected to the old widget. + checkboxesWidget.toggle( false ); + checkboxesWidget.$element.after( capsulesWidget.$element ); + } + mw.hook( 'htmlform.enhance' ).add( function ( $root ) { - if ( $root.find( '.mw-htmlform-dropdown' ).length ) { - mw.loader.using( 'jquery.chosen', function () { - $root.find( '.mw-htmlform-dropdown' ).each( function () { - var type = this.nodeName.toLowerCase(), - $converted = convertCheckboxesToMulti( $( this ), type ); - $converted.find( '.htmlform-chzn-select' ).chosen( { width: 'auto' } ); - } ); + var $dropdowns = $root.find( '.mw-htmlform-field-HTMLMultiSelectField.mw-htmlform-dropdown' ); + if ( $dropdowns.length ) { + $dropdowns.each( function () { + var $el = $( this ), + data, modules, extraModules; + if ( $el.is( '[data-ooui]' ) ) { + // Load 'oojs-ui-widgets' for CapsuleMultiselectWidget + modules = [ 'mediawiki.htmlform.ooui', 'oojs-ui-widgets' ]; + data = $el.data( 'mw-modules' ); + if ( data ) { + // We can trust this value, 'data-mw-*' attributes are banned from user content in Sanitizer + extraModules = data.split( ',' ); + modules.push.apply( modules, extraModules ); + } + mw.loader.using( modules, function () { + convertCheckboxesWidgetToCapsules( OO.ui.FieldLayout.static.infuse( $el ) ); + } ); + } else { + mw.loader.using( 'jquery.chosen', function () { + var type = $el.is( 'tr' ) ? 'tr' : 'div', + $converted = convertCheckboxesToMulti( $el, type ); + $converted.find( '.htmlform-chzn-select' ).chosen( { width: 'auto' } ); + } ); + } } ); } } ); diff --git a/resources/src/mediawiki/htmlform/ooui.styles.css b/resources/src/mediawiki/htmlform/ooui.styles.css index a9e75d7163..40f4f5242e 100644 --- a/resources/src/mediawiki/htmlform/ooui.styles.css +++ b/resources/src/mediawiki/htmlform/ooui.styles.css @@ -1,9 +1,5 @@ /* OOUIHTMLForm styles */ -.mw-htmlform-ooui-wrapper { - margin: 1em 0; -} - .mw-htmlform-ooui .mw-htmlform-submit-buttons { margin-top: 1em; } @@ -22,8 +18,8 @@ /* Flatlist styling for PHP widgets... */ .mw-htmlform-flatlist .oo-ui-fieldLayout-align-inline, /* ...and for JS widgets */ -.mw-htmlform-flatlist .oo-ui-optionWidget, -.mw-htmlform-flatlist .oo-ui-multioptionWidget { +.mw-htmlform-flatlist .oo-ui-radioOptionWidget, +.mw-htmlform-flatlist .oo-ui-checkboxMultioptionWidget { display: inline-block; margin-right: 1em; } diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js index 0f61d975f1..a5cf1d85c2 100644 --- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js @@ -1,4 +1,4 @@ -/*global moment */ +/* global moment, Uint8Array */ ( function ( $, mw ) { /** @@ -18,6 +18,9 @@ * @class mw.ForeignStructuredUpload.BookletLayout * @uses mw.ForeignStructuredUpload * @extends mw.Upload.BookletLayout + * + * @constructor + * @param {Object} config Configuration options * @cfg {string} [target] Used to choose the target repository. * If nothing is passed, the {@link mw.ForeignUpload#property-target default} is used. */ @@ -309,6 +312,50 @@ } ); }; + /** + * @param {mw.Title} filename + * @return {jQuery.Promise} Resolves (on success) or rejects with OO.ui.Error + */ + mw.ForeignStructuredUpload.BookletLayout.prototype.validateFilename = function ( filename ) { + return ( new mw.Api() ).get( { + action: 'query', + prop: 'info', + titles: filename.getPrefixedDb(), + formatversion: 2 + } ).then( + function ( result ) { + // if the file already exists, reject right away, before + // ever firing finishStashUpload() + if ( !result.query.pages[ 0 ].missing ) { + return $.Deferred().reject( new OO.ui.Error( + $( '

' ).msg( 'fileexists', filename.getPrefixedDb() ), + { recoverable: false } + ) ); + } + }, + function () { + // API call failed - this could be a connection hiccup... + // Let's just ignore this validation step and turn this + // failure into a successful resolve ;) + return $.Deferred().resolve(); + } + ); + }; + + /** + * @inheritdoc + */ + mw.ForeignStructuredUpload.BookletLayout.prototype.saveFile = function () { + var title = mw.Title.newFromText( + this.getFilename(), + mw.config.get( 'wgNamespaceIds' ).file + ); + + return this.uploadPromise + .then( this.validateFilename.bind( this, title ) ) + .then( mw.ForeignStructuredUpload.BookletLayout.parent.prototype.saveFile.bind( this ) ); + }; + /* Getters */ /** @@ -351,7 +398,7 @@ } try { - metadata = mw.libs.jpegmeta( this.result, file.name ); + metadata = mw.libs.jpegmeta( fileStr, file.name ); } catch ( e ) { metadata = null; } diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js index 3a0a94b377..0c572d4991 100644 --- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js +++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js @@ -1,8 +1,5 @@ ( function ( mw, $, OO ) { /** - * @class mw.ForeignStructuredUpload - * @extends mw.ForeignUpload - * * Used to represent an upload in progress on the frontend. * * This subclass will upload to a wiki using a structured metadata @@ -14,7 +11,12 @@ * **TODO: This currently only supports uploads under CC-BY-SA 4.0, * and should really have support for more licenses.** * - * @inheritdoc + * @class mw.ForeignStructuredUpload + * @extends mw.ForeignUpload + * + * @constructor + * @param {string} [target] + * @param {Object} [apiconfig] */ function ForeignStructuredUpload( target, apiconfig ) { this.date = undefined; diff --git a/resources/src/mediawiki/mediawiki.ForeignUpload.js b/resources/src/mediawiki/mediawiki.ForeignUpload.js index 781c1dfe26..08fc01d2f2 100644 --- a/resources/src/mediawiki/mediawiki.ForeignUpload.js +++ b/resources/src/mediawiki/mediawiki.ForeignUpload.js @@ -1,8 +1,5 @@ ( function ( mw, OO, $ ) { /** - * @class mw.ForeignUpload - * @extends mw.Upload - * * Used to represent an upload in progress on the frontend. * * Subclassed to upload to a foreign API, with no other goodies. Use @@ -12,6 +9,9 @@ * an object, we assume you want the default, and treat it as apiconfig * instead. * + * @class mw.ForeignUpload + * @extends mw.Upload + * * @constructor * @param {string} [target] Used to set up the target * wiki. If not remote, this class behaves identically to mw.Upload (unless further subclassed) @@ -115,6 +115,8 @@ /** * Override from mw.Upload to make sure the API info is found and allowed + * + * @inheritdoc */ ForeignUpload.prototype.upload = function () { var upload = this; @@ -126,6 +128,8 @@ /** * Override from mw.Upload to make sure the API info is found and allowed + * + * @inheritdoc */ ForeignUpload.prototype.uploadToStash = function () { var upload = this; diff --git a/resources/src/mediawiki/mediawiki.Title.js b/resources/src/mediawiki/mediawiki.Title.js index 4c57faa6c8..0e2af5060a 100644 --- a/resources/src/mediawiki/mediawiki.Title.js +++ b/resources/src/mediawiki/mediawiki.Title.js @@ -3,17 +3,15 @@ * @author Timo Tijhof, 2011-2013 * @since 1.18 */ -( function ( mw, $ ) { - /*jshint latedef:false */ +/* eslint-disable no-use-before-define */ + +( function ( mw, $ ) { /** * Parse titles into an object structure. Note that when using the constructor * directly, passing invalid titles will result in an exception. Use #newFromText to use the * logic directly and get null for invalid titles which is easier to work with. * - * @class mw.Title - */ - /** * Note that in the constructor and #newFromText method, `namespace` is the **default** namespace * only, and can be overridden by a namespace prefix in `title`. If you do not want this behavior, * use #makeTitle. Compare: @@ -30,7 +28,8 @@ * mw.Title.newFromText( 'Template:Foo', NS_TEMPLATE ).getPrefixedText(); // => 'Template:Foo' * mw.Title.makeTitle( NS_TEMPLATE, 'Template:Foo' ).getPrefixedText(); // => 'Template:Template:Foo' * - * @method constructor + * @class mw.Title + * @constructor * @param {string} title Title of the page. If no second argument given, * this will be searched for a namespace * @param {number} [namespace=NS_MAIN] If given, will used as default namespace for the given title @@ -46,438 +45,430 @@ this.title = parsed.title; this.ext = parsed.ext; this.fragment = parsed.fragment; - - return this; } /* Private members */ + // eslint-disable-next-line vars-on-top var + namespaceIds = mw.config.get( 'wgNamespaceIds' ), - namespaceIds = mw.config.get( 'wgNamespaceIds' ), + /** + * @private + * @static + * @property NS_MAIN + */ + NS_MAIN = namespaceIds[ '' ], - /** - * @private - * @static - * @property NS_MAIN - */ - NS_MAIN = namespaceIds[ '' ], + /** + * @private + * @static + * @property NS_TALK + */ + NS_TALK = namespaceIds.talk, - /** - * @private - * @static - * @property NS_TALK - */ - NS_TALK = namespaceIds.talk, + /** + * @private + * @static + * @property NS_SPECIAL + */ + NS_SPECIAL = namespaceIds.special, - /** - * @private - * @static - * @property NS_SPECIAL - */ - NS_SPECIAL = namespaceIds.special, + /** + * @private + * @static + * @property NS_MEDIA + */ + NS_MEDIA = namespaceIds.media, - /** - * @private - * @static - * @property NS_MEDIA - */ - NS_MEDIA = namespaceIds.media, + /** + * @private + * @static + * @property NS_FILE + */ + NS_FILE = namespaceIds.file, - /** - * @private - * @static - * @property NS_FILE - */ - NS_FILE = namespaceIds.file, + /** + * @private + * @static + * @property FILENAME_MAX_BYTES + */ + FILENAME_MAX_BYTES = 240, - /** - * @private - * @static - * @property FILENAME_MAX_BYTES - */ - FILENAME_MAX_BYTES = 240, + /** + * @private + * @static + * @property TITLE_MAX_BYTES + */ + TITLE_MAX_BYTES = 255, - /** - * @private - * @static - * @property TITLE_MAX_BYTES - */ - TITLE_MAX_BYTES = 255, + /** + * Get the namespace id from a namespace name (either from the localized, canonical or alias + * name). + * + * Example: On a German wiki this would return 6 for any of 'File', 'Datei', 'Image' or + * even 'Bild'. + * + * @private + * @static + * @method getNsIdByName + * @param {string} ns Namespace name (case insensitive, leading/trailing space ignored) + * @return {number|boolean} Namespace id or boolean false + */ + getNsIdByName = function ( ns ) { + var id; + + // Don't cast non-strings to strings, because null or undefined should not result in + // returning the id of a potential namespace called "Null:" (e.g. on null.example.org/wiki) + // Also, toLowerCase throws exception on null/undefined, because it is a String method. + if ( typeof ns !== 'string' ) { + return false; + } + // TODO: Should just use local var namespaceIds here but it + // breaks test which modify the config + id = mw.config.get( 'wgNamespaceIds' )[ ns.toLowerCase() ]; + if ( id === undefined ) { + return false; + } + return id; + }, - /** - * Get the namespace id from a namespace name (either from the localized, canonical or alias - * name). - * - * Example: On a German wiki this would return 6 for any of 'File', 'Datei', 'Image' or - * even 'Bild'. - * - * @private - * @static - * @method getNsIdByName - * @param {string} ns Namespace name (case insensitive, leading/trailing space ignored) - * @return {number|boolean} Namespace id or boolean false - */ - getNsIdByName = function ( ns ) { - var id; - - // Don't cast non-strings to strings, because null or undefined should not result in - // returning the id of a potential namespace called "Null:" (e.g. on null.example.org/wiki) - // Also, toLowerCase throws exception on null/undefined, because it is a String method. - if ( typeof ns !== 'string' ) { - return false; - } - // TODO: Should just use local var namespaceIds here but it - // breaks test which modify the config - id = mw.config.get( 'wgNamespaceIds' )[ ns.toLowerCase() ]; - if ( id === undefined ) { - return false; - } - return id; - }, + /** + * @private + * @method getNamespacePrefix_ + * @param {number} namespace + * @return {string} + */ + getNamespacePrefix = function ( namespace ) { + return namespace === NS_MAIN ? + '' : + ( mw.config.get( 'wgFormattedNamespaces' )[ namespace ].replace( / /g, '_' ) + ':' ); + }, - /** - * @private - * @method getNamespacePrefix_ - * @param {number} namespace - * @return {string} - */ - getNamespacePrefix = function ( namespace ) { - return namespace === NS_MAIN ? - '' : - ( mw.config.get( 'wgFormattedNamespaces' )[ namespace ].replace( / /g, '_' ) + ':' ); - }, - - rUnderscoreTrim = /^_+|_+$/g, - - rSplit = /^(.+?)_*:_*(.*)$/, - - // See MediaWikiTitleCodec.php#getTitleInvalidRegex - rInvalid = new RegExp( - '[^' + mw.config.get( 'wgLegalTitleChars' ) + ']' + - // URL percent encoding sequences interfere with the ability - // to round-trip titles -- you can't link to them consistently. - '|%[0-9A-Fa-f]{2}' + - // XML/HTML character references produce similar issues. - '|&[A-Za-z0-9\u0080-\uFFFF]+;' + - '|&#[0-9]+;' + - '|&#x[0-9A-Fa-f]+;' - ), - - // From MediaWikiTitleCodec.php#L225 @26fcab1f18c568a41 - // "Clean up whitespace" in function MediaWikiTitleCodec::splitTitleString() - rWhitespace = /[ _\u0009\u00A0\u1680\u180E\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\s]+/g, + rUnderscoreTrim = /^_+|_+$/g, - /** - * Slightly modified from Flinfo. Credit goes to Lupo and Flominator. - * @private - * @static - * @property sanitationRules - */ - sanitationRules = [ - // "signature" - { - pattern: /~{3}/g, - replace: '', - generalRule: true - }, - // Space, underscore, tab, NBSP and other unusual spaces - { - pattern: rWhitespace, - replace: ' ', - generalRule: true - }, - // unicode bidi override characters: Implicit, Embeds, Overrides - { - pattern: /[\u200E\u200F\u202A-\u202E]/g, - replace: '', - generalRule: true - }, - // control characters - { - pattern: /[\x00-\x1f\x7f]/g, - replace: '', - generalRule: true - }, - // URL encoding (possibly) - { - pattern: /%([0-9A-Fa-f]{2})/g, - replace: '% $1', - generalRule: true - }, - // HTML-character-entities - { - pattern: /&(([A-Za-z0-9\x80-\xff]+|#[0-9]+|#x[0-9A-Fa-f]+);)/g, - replace: '& $1', - generalRule: true - }, - // slash, colon (not supported by file systems like NTFS/Windows, Mac OS 9 [:], ext4 [/]) - { - pattern: new RegExp( '[' + mw.config.get( 'wgIllegalFileChars', '' ) + ']', 'g' ), - replace: '-', - fileRule: true - }, - // brackets, greater than - { - pattern: /[\]\}>]/g, - replace: ')', - generalRule: true - }, - // brackets, lower than - { - pattern: /[\[\{<]/g, - replace: '(', - generalRule: true - }, - // everything that wasn't covered yet - { - pattern: new RegExp( rInvalid.source, 'g' ), - replace: '-', - generalRule: true - }, - // directory structures - { - pattern: /^(\.|\.\.|\.\/.*|\.\.\/.*|.*\/\.\/.*|.*\/\.\.\/.*|.*\/\.|.*\/\.\.)$/g, - replace: '', - generalRule: true - } - ], + rSplit = /^(.+?)_*:_*(.*)$/, - /** - * Internal helper for #constructor and #newFromText. - * - * Based on Title.php#secureAndSplit - * - * @private - * @static - * @method parse - * @param {string} title - * @param {number} [defaultNamespace=NS_MAIN] - * @return {Object|boolean} - */ - parse = function ( title, defaultNamespace ) { - var namespace, m, id, i, fragment, ext; + // See MediaWikiTitleCodec.php#getTitleInvalidRegex + rInvalid = new RegExp( + '[^' + mw.config.get( 'wgLegalTitleChars' ) + ']' + + // URL percent encoding sequences interfere with the ability + // to round-trip titles -- you can't link to them consistently. + '|%[0-9A-Fa-f]{2}' + + // XML/HTML character references produce similar issues. + '|&[A-Za-z0-9\u0080-\uFFFF]+;' + + '|&#[0-9]+;' + + '|&#x[0-9A-Fa-f]+;' + ), - namespace = defaultNamespace === undefined ? NS_MAIN : defaultNamespace; + // From MediaWikiTitleCodec::splitTitleString() in PHP + // Note that this is not equivalent to /\s/, e.g. underscore is included, tab is not included. + rWhitespace = /[ _\u00A0\u1680\u180E\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]+/g, - title = title - // Normalise whitespace to underscores and remove duplicates - .replace( /[ _\s]+/g, '_' ) - // Trim underscores - .replace( rUnderscoreTrim, '' ); + // From MediaWikiTitleCodec::splitTitleString() in PHP + rUnicodeBidi = /[\u200E\u200F\u202A-\u202E]/g, + + /** + * Slightly modified from Flinfo. Credit goes to Lupo and Flominator. + * @private + * @static + * @property sanitationRules + */ + sanitationRules = [ + // "signature" + { + pattern: /~{3}/g, + replace: '', + generalRule: true + }, + // control characters + { + // eslint-disable-next-line no-control-regex + pattern: /[\x00-\x1f\x7f]/g, + replace: '', + generalRule: true + }, + // URL encoding (possibly) + { + pattern: /%([0-9A-Fa-f]{2})/g, + replace: '% $1', + generalRule: true + }, + // HTML-character-entities + { + pattern: /&(([A-Za-z0-9\x80-\xff]+|#[0-9]+|#x[0-9A-Fa-f]+);)/g, + replace: '& $1', + generalRule: true + }, + // slash, colon (not supported by file systems like NTFS/Windows, Mac OS 9 [:], ext4 [/]) + { + pattern: new RegExp( '[' + mw.config.get( 'wgIllegalFileChars', '' ) + ']', 'g' ), + replace: '-', + fileRule: true + }, + // brackets, greater than + { + pattern: /[\]\}>]/g, + replace: ')', + generalRule: true + }, + // brackets, lower than + { + pattern: /[\[\{<]/g, + replace: '(', + generalRule: true + }, + // everything that wasn't covered yet + { + pattern: new RegExp( rInvalid.source, 'g' ), + replace: '-', + generalRule: true + }, + // directory structures + { + pattern: /^(\.|\.\.|\.\/.*|\.\.\/.*|.*\/\.\/.*|.*\/\.\.\/.*|.*\/\.|.*\/\.\.)$/g, + replace: '', + generalRule: true + } + ], + + /** + * Internal helper for #constructor and #newFromText. + * + * Based on Title.php#secureAndSplit + * + * @private + * @static + * @method parse + * @param {string} title + * @param {number} [defaultNamespace=NS_MAIN] + * @return {Object|boolean} + */ + parse = function ( title, defaultNamespace ) { + var namespace, m, id, i, fragment, ext; + + namespace = defaultNamespace === undefined ? NS_MAIN : defaultNamespace; - // Process initial colon - if ( title !== '' && title[ 0 ] === ':' ) { - // Initial colon means main namespace instead of specified default - namespace = NS_MAIN; title = title - // Strip colon - .slice( 1 ) + // Strip Unicode bidi override characters + .replace( rUnicodeBidi, '' ) + // Normalise whitespace to underscores and remove duplicates + .replace( rWhitespace, '_' ) // Trim underscores .replace( rUnderscoreTrim, '' ); - } - if ( title === '' ) { - return false; - } + // Process initial colon + if ( title !== '' && title[ 0 ] === ':' ) { + // Initial colon means main namespace instead of specified default + namespace = NS_MAIN; + title = title + // Strip colon + .slice( 1 ) + // Trim underscores + .replace( rUnderscoreTrim, '' ); + } - // Process namespace prefix (if any) - m = title.match( rSplit ); - if ( m ) { - id = getNsIdByName( m[ 1 ] ); - if ( id !== false ) { - // Ordinary namespace - namespace = id; - title = m[ 2 ]; + if ( title === '' ) { + return false; + } - // For Talk:X pages, make sure X has no "namespace" prefix - if ( namespace === NS_TALK && ( m = title.match( rSplit ) ) ) { - // Disallow titles like Talk:File:x (subject should roundtrip: talk:file:x -> file:x -> file_talk:x) - if ( getNsIdByName( m[ 1 ] ) !== false ) { - return false; + // Process namespace prefix (if any) + m = title.match( rSplit ); + if ( m ) { + id = getNsIdByName( m[ 1 ] ); + if ( id !== false ) { + // Ordinary namespace + namespace = id; + title = m[ 2 ]; + + // For Talk:X pages, make sure X has no "namespace" prefix + if ( namespace === NS_TALK && ( m = title.match( rSplit ) ) ) { + // Disallow titles like Talk:File:x (subject should roundtrip: talk:file:x -> file:x -> file_talk:x) + if ( getNsIdByName( m[ 1 ] ) !== false ) { + return false; + } } } } - } - - // Process fragment - i = title.indexOf( '#' ); - if ( i === -1 ) { - fragment = null; - } else { - fragment = title - // Get segment starting after the hash - .slice( i + 1 ) - // Convert to text - // NB: Must not be trimmed ("Example#_foo" is not the same as "Example#foo") - .replace( /_/g, ' ' ); - title = title - // Strip hash - .slice( 0, i ) - // Trim underscores, again (strips "_" from "bar" in "Foo_bar_#quux") - .replace( rUnderscoreTrim, '' ); - } + // Process fragment + i = title.indexOf( '#' ); + if ( i === -1 ) { + fragment = null; + } else { + fragment = title + // Get segment starting after the hash + .slice( i + 1 ) + // Convert to text + // NB: Must not be trimmed ("Example#_foo" is not the same as "Example#foo") + .replace( /_/g, ' ' ); + + title = title + // Strip hash + .slice( 0, i ) + // Trim underscores, again (strips "_" from "bar" in "Foo_bar_#quux") + .replace( rUnderscoreTrim, '' ); + } - // Reject illegal characters - if ( title.match( rInvalid ) ) { - return false; - } + // Reject illegal characters + if ( title.match( rInvalid ) ) { + return false; + } - // Disallow titles that browsers or servers might resolve as directory navigation - if ( - title.indexOf( '.' ) !== -1 && ( - title === '.' || title === '..' || - title.indexOf( './' ) === 0 || - title.indexOf( '../' ) === 0 || - title.indexOf( '/./' ) !== -1 || - title.indexOf( '/../' ) !== -1 || - title.slice( -2 ) === '/.' || - title.slice( -3 ) === '/..' - ) - ) { - return false; - } + // Disallow titles that browsers or servers might resolve as directory navigation + if ( + title.indexOf( '.' ) !== -1 && ( + title === '.' || title === '..' || + title.indexOf( './' ) === 0 || + title.indexOf( '../' ) === 0 || + title.indexOf( '/./' ) !== -1 || + title.indexOf( '/../' ) !== -1 || + title.slice( -2 ) === '/.' || + title.slice( -3 ) === '/..' + ) + ) { + return false; + } - // Disallow magic tilde sequence - if ( title.indexOf( '~~~' ) !== -1 ) { - return false; - } + // Disallow magic tilde sequence + if ( title.indexOf( '~~~' ) !== -1 ) { + return false; + } - // Disallow titles exceeding the TITLE_MAX_BYTES byte size limit (size of underlying database field) - // Except for special pages, e.g. [[Special:Block/Long name]] - // Note: The PHP implementation also asserts that even in NS_SPECIAL, the title should - // be less than 512 bytes. - if ( namespace !== NS_SPECIAL && $.byteLength( title ) > TITLE_MAX_BYTES ) { - return false; - } + // Disallow titles exceeding the TITLE_MAX_BYTES byte size limit (size of underlying database field) + // Except for special pages, e.g. [[Special:Block/Long name]] + // Note: The PHP implementation also asserts that even in NS_SPECIAL, the title should + // be less than 512 bytes. + if ( namespace !== NS_SPECIAL && $.byteLength( title ) > TITLE_MAX_BYTES ) { + return false; + } - // Can't make a link to a namespace alone. - if ( title === '' && namespace !== NS_MAIN ) { - return false; - } + // Can't make a link to a namespace alone. + if ( title === '' && namespace !== NS_MAIN ) { + return false; + } - // Any remaining initial :s are illegal. - if ( title[ 0 ] === ':' ) { - return false; - } + // Any remaining initial :s are illegal. + if ( title[ 0 ] === ':' ) { + return false; + } - // For backwards-compatibility with old mw.Title, we separate the extension from the - // rest of the title. - i = title.lastIndexOf( '.' ); - if ( i === -1 || title.length <= i + 1 ) { - // Extensions are the non-empty segment after the last dot - ext = null; - } else { - ext = title.slice( i + 1 ); - title = title.slice( 0, i ); - } + // For backwards-compatibility with old mw.Title, we separate the extension from the + // rest of the title. + i = title.lastIndexOf( '.' ); + if ( i === -1 || title.length <= i + 1 ) { + // Extensions are the non-empty segment after the last dot + ext = null; + } else { + ext = title.slice( i + 1 ); + title = title.slice( 0, i ); + } - return { - namespace: namespace, - title: title, - ext: ext, - fragment: fragment - }; - }, + return { + namespace: namespace, + title: title, + ext: ext, + fragment: fragment + }; + }, - /** - * Convert db-key to readable text. - * - * @private - * @static - * @method text - * @param {string} s - * @return {string} - */ - text = function ( s ) { - if ( s !== null && s !== undefined ) { - return s.replace( /_/g, ' ' ); - } else { - return ''; - } - }, + /** + * Convert db-key to readable text. + * + * @private + * @static + * @method text + * @param {string} s + * @return {string} + */ + text = function ( s ) { + if ( s !== null && s !== undefined ) { + return s.replace( /_/g, ' ' ); + } else { + return ''; + } + }, - /** - * Sanitizes a string based on a rule set and a filter - * - * @private - * @static - * @method sanitize - * @param {string} s - * @param {Array} filter - * @return {string} - */ - sanitize = function ( s, filter ) { - var i, ruleLength, rule, m, filterLength, - rules = sanitationRules; - - for ( i = 0, ruleLength = rules.length; i < ruleLength; ++i ) { - rule = rules[ i ]; - for ( m = 0, filterLength = filter.length; m < filterLength; ++m ) { - if ( rule[ filter[ m ] ] ) { - s = s.replace( rule.pattern, rule.replace ); + /** + * Sanitizes a string based on a rule set and a filter + * + * @private + * @static + * @method sanitize + * @param {string} s + * @param {Array} filter + * @return {string} + */ + sanitize = function ( s, filter ) { + var i, ruleLength, rule, m, filterLength, + rules = sanitationRules; + + for ( i = 0, ruleLength = rules.length; i < ruleLength; ++i ) { + rule = rules[ i ]; + for ( m = 0, filterLength = filter.length; m < filterLength; ++m ) { + if ( rule[ filter[ m ] ] ) { + s = s.replace( rule.pattern, rule.replace ); + } } } - } - return s; - }, - - /** - * Cuts a string to a specific byte length, assuming UTF-8 - * or less, if the last character is a multi-byte one - * - * @private - * @static - * @method trimToByteLength - * @param {string} s - * @param {number} length - * @return {string} - */ - trimToByteLength = function ( s, length ) { - var byteLength, chopOffChars, chopOffBytes; - - // bytelength is always greater or equal to the length in characters - s = s.substr( 0, length ); - while ( ( byteLength = $.byteLength( s ) ) > length ) { - // Calculate how many characters can be safely removed - // First, we need to know how many bytes the string exceeds the threshold - chopOffBytes = byteLength - length; - // A character in UTF-8 is at most 4 bytes - // One character must be removed in any case because the - // string is too long - chopOffChars = Math.max( 1, Math.floor( chopOffBytes / 4 ) ); - s = s.substr( 0, s.length - chopOffChars ); - } - return s; - }, + return s; + }, - /** - * Cuts a file name to a specific byte length - * - * @private - * @static - * @method trimFileNameToByteLength - * @param {string} name without extension - * @param {string} extension file extension - * @return {string} The full name, including extension - */ - trimFileNameToByteLength = function ( name, extension ) { - // There is a special byte limit for file names and ... remember the dot - return trimToByteLength( name, FILENAME_MAX_BYTES - extension.length - 1 ) + '.' + extension; - }, - - // Polyfill for ES5 Object.create - createObject = Object.create || ( function () { - return function ( o ) { - function Title() {} - if ( o !== Object( o ) ) { - throw new Error( 'Cannot inherit from a non-object' ); + /** + * Cuts a string to a specific byte length, assuming UTF-8 + * or less, if the last character is a multi-byte one + * + * @private + * @static + * @method trimToByteLength + * @param {string} s + * @param {number} length + * @return {string} + */ + trimToByteLength = function ( s, length ) { + var byteLength, chopOffChars, chopOffBytes; + + // bytelength is always greater or equal to the length in characters + s = s.substr( 0, length ); + while ( ( byteLength = $.byteLength( s ) ) > length ) { + // Calculate how many characters can be safely removed + // First, we need to know how many bytes the string exceeds the threshold + chopOffBytes = byteLength - length; + // A character in UTF-8 is at most 4 bytes + // One character must be removed in any case because the + // string is too long + chopOffChars = Math.max( 1, Math.floor( chopOffBytes / 4 ) ); + s = s.substr( 0, s.length - chopOffChars ); } - Title.prototype = o; - return new Title(); - }; - }() ); + return s; + }, + + /** + * Cuts a file name to a specific byte length + * + * @private + * @static + * @method trimFileNameToByteLength + * @param {string} name without extension + * @param {string} extension file extension + * @return {string} The full name, including extension + */ + trimFileNameToByteLength = function ( name, extension ) { + // There is a special byte limit for file names and ... remember the dot + return trimToByteLength( name, FILENAME_MAX_BYTES - extension.length - 1 ) + '.' + extension; + }, + + // Polyfill for ES5 Object.create + createObject = Object.create || ( function () { + return function ( o ) { + function Title() {} + if ( o !== Object( o ) ) { + throw new Error( 'Cannot inherit from a non-object' ); + } + Title.prototype = o; + return new Title(); + }; + }() ); /* Static members */ @@ -557,8 +548,8 @@ namespace = defaultNamespace === undefined ? NS_MAIN : defaultNamespace; - // Normalise whitespace and remove duplicates - title = $.trim( title.replace( rWhitespace, ' ' ) ); + // Normalise additional whitespace + title = $.trim( title.replace( /\s/g, ' ' ) ); // Process initial colon if ( title !== '' && title[ 0 ] === ':' ) { @@ -582,8 +573,9 @@ } } - if ( namespace === NS_MEDIA - || ( options.forUploading && ( namespace === NS_FILE ) ) + if ( + namespace === NS_MEDIA || + ( options.forUploading && ( namespace === NS_FILE ) ) ) { title = sanitize( title, [ 'generalRule', 'fileRule' ] ); @@ -750,13 +742,13 @@ pages: {}, set: function ( titles, state ) { + var i, len, + pages = this.pages; + titles = $.isArray( titles ) ? titles : [ titles ]; state = state === undefined ? true : !!state; - var i, - pages = this.pages, - len = titles.length; - for ( i = 0; i < len; i++ ) { + for ( i = 0, len = titles.length; i < len; i++ ) { pages[ titles[ i ] ] = state; } return true; @@ -834,7 +826,9 @@ ) { return this.title; } - return this.title[ 0 ].toUpperCase() + this.title.slice( 1 ); + // PHP's strtoupper differs from String.toUpperCase in a number of cases + // Bug: T147646 + return mw.Title.phpCharToUpper( this.title[ 0 ] ) + this.title.slice( 1 ); }, /** diff --git a/resources/src/mediawiki/mediawiki.Title.phpCharToUpper.js b/resources/src/mediawiki/mediawiki.Title.phpCharToUpper.js new file mode 100644 index 0000000000..2b39c9ab29 --- /dev/null +++ b/resources/src/mediawiki/mediawiki.Title.phpCharToUpper.js @@ -0,0 +1,255 @@ +// This file can't be parsed by JSDuck due to . +// (It is excluded in jsduck.json.) +// ESLint suggests unquoting some object keys, which would render the file unparseable by Opera 12. +/* eslint-disable quote-props */ +( function ( mw ) { + var toUpperMapping = { + 'Ã': 'Ã', + 'Å': 'Å', + 'Ç': 'Ç', + 'Ç': 'Ç', + 'Ç': 'Ç', + 'Ç': 'Ç', + 'Ç': 'Ç', + 'Ç': 'Ç', + 'Ç°': 'Ç°', + 'Ç²': 'Ç²', + 'Ç³': 'Ç²', + 'Ê': 'ê²', + 'Í': 'Í', + 'Î': 'Î', + 'Î°': 'Î°', + 'Ö': 'Ö', + 'á¸': 'á°', + 'á¹': 'á±', + 'áº': 'á²', + 'á»': 'á³', + 'á¼': 'á´', + 'á½': 'áµ', + 'áº': 'áº', + 'áº': 'áº', + 'áº': 'áº', + 'áº': 'áº', + 'áº': 'áº', + 'á½': 'á½', + 'á½': 'á½', + 'á½': 'á½', + 'á½': 'á½', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾': 'á¾', + 'á¾ ': 'á¾¨', + 'á¾¡': 'á¾©', + 'á¾¢': 'á¾ª', + 'á¾£': 'á¾«', + 'á¾¤': 'á¾¬', + 'á¾¥': 'á¾', + 'á¾¦': 'á¾®', + 'á¾§': 'á¾¯', + 'á¾¨': 'á¾¨', + 'á¾©': 'á¾©', + 'á¾ª': 'á¾ª', + 'á¾«': 'á¾«', + 'á¾¬': 'á¾¬', + 'á¾': 'á¾', + 'á¾®': 'á¾®', + 'á¾¯': 'á¾¯', + 'á¾²': 'á¾²', + 'á¾³': 'á¾¼', + 'á¾´': 'á¾´', + 'á¾¶': 'á¾¶', + 'á¾·': 'á¾·', + 'á¾¼': 'á¾¼', + 'á¿': 'á¿', + 'á¿': 'á¿', + 'á¿': 'á¿', + 'á¿': 'á¿', + 'á¿': 'á¿', + 'á¿': 'á¿', + 'á¿': 'á¿', + 'á¿': 'á¿', + 'á¿': 'á¿', + 'á¿': 'á¿', + 'á¿¢': 'á¿¢', + 'á¿£': 'á¿£', + 'á¿¤': 'á¿¤', + 'á¿¦': 'á¿¦', + 'á¿§': 'á¿§', + 'á¿²': 'á¿²', + 'á¿³': 'á¿¼', + 'á¿´': 'á¿´', + 'á¿¶': 'á¿¶', + 'á¿·': 'á¿·', + 'á¿¼': 'á¿¼', + 'â°': 'â°', + 'â±': 'â±', + 'â²': 'â²', + 'â³': 'â³', + 'â´': 'â´', + 'âµ': 'âµ', + 'â¶': 'â¶', + 'â·': 'â·', + 'â¸': 'â¸', + 'â¹': 'â¹', + 'âº': 'âº', + 'â»': 'â»', + 'â¼': 'â¼', + 'â½': 'â½', + 'â¾': 'â¾', + 'â¿': 'â¿', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â': 'â', + 'â ': 'â ', + 'â¡': 'â¡', + 'â¢': 'â¢', + 'â£': 'â£', + 'â¤': 'â¤', + 'â¥': 'â¥', + 'â¦': 'â¦', + 'â§': 'â§', + 'â¨': 'â¨', + 'â©': 'â©', + 'êµ': 'ê´', + 'ê·': 'ê¶', + 'ê': 'ê³', + 'ê°': 'á ', + 'ê±': 'á¡', + 'ê²': 'á¢', + 'ê³': 'á£', + 'ê´': 'á¤', + 'êµ': 'á¥', + 'ê¶': 'á¦', + 'ê·': 'á§', + 'ê¸': 'á¨', + 'ê¹': 'á©', + 'êº': 'áª', + 'ê»': 'á«', + 'ê¼': 'á¬', + 'ê½': 'á', + 'ê¾': 'á®', + 'ê¿': 'á¯', + 'ê®': 'á°', + 'ê®': 'á±', + 'ê®': 'á²', + 'ê®': 'á³', + 'ê®': 'á´', + 'ê®': 'áµ', + 'ê®': 'á¶', + 'ê®': 'á·', + 'ê®': 'á¸', + 'ê®': 'á¹', + 'ê®': 'áº', + 'ê®': 'á»', + 'ê®': 'á¼', + 'ê®': 'á½', + 'ê®': 'á¾', + 'ê®': 'á¿', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê®': 'á', + 'ê® ': 'á', + 'ê®¡': 'á', + 'ê®¢': 'á', + 'ê®£': 'á', + 'ê®¤': 'á', + 'ê®¥': 'á', + 'ê®¦': 'á', + 'ê®§': 'á', + 'ê®¨': 'á', + 'ê®©': 'á', + 'ê®ª': 'á', + 'ê®«': 'á', + 'ê®¬': 'á', + 'ê®': 'á', + 'ê®®': 'á', + 'ê®¯': 'á', + 'ê®°': 'á ', + 'ê®±': 'á¡', + 'ê®²': 'á¢', + 'ê®³': 'á£', + 'ê®´': 'á¤', + 'ê®µ': 'á¥', + 'ê®¶': 'á¦', + 'ê®·': 'á§', + 'ê®¸': 'á¨', + 'ê®¹': 'á©', + 'ê®º': 'áª', + 'ê®»': 'á«', + 'ê®¼': 'á¬', + 'ê®½': 'á', + 'ê®¾': 'á®', + 'ê®¿': 'á¯', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬', + 'ï¬': 'ï¬' + }; + mw.Title.phpCharToUpper = function ( chr ) { + var mapped = toUpperMapping[ chr ]; + return mapped || chr.toUpperCase(); + }; +}( mediaWiki ) ); diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.css b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.css index 68062d02f0..03df0864d6 100644 --- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.css +++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.css @@ -30,6 +30,6 @@ } .mw-upload-bookletLayout-filePreview .oo-ui-progressBarWidget-bar { - background-color: #347bff; + background-color: #36c; height: 0.5em; } \ No newline at end of file diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js index 31e4492d3a..c7ebfd8a51 100644 --- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js @@ -1,4 +1,4 @@ -/*global moment*/ +/* global moment*/ ( function ( $, mw, moment ) { /** @@ -187,8 +187,11 @@ // If the user can't upload anything, don't give them the option to. api.getUserInfo().then( function ( userInfo ) { if ( userInfo.rights.indexOf( 'upload' ) === -1 ) { - // TODO Use a better error message when not all logged-in users can upload - booklet.getPage( 'upload' ).$element.msg( 'api-error-mustbeloggedin' ); + if ( mw.user.isAnon() ) { + booklet.getPage( 'upload' ).$element.msg( 'api-error-mustbeloggedin' ); + } else { + booklet.getPage( 'upload' ).$element.msg( 'api-error-badaccess-groups' ); + } } return $.Deferred().resolve(); } ) @@ -345,15 +348,18 @@ if ( error.message ) { return this.upload.getApi() .then( function ( api ) { - return api.loadMessagesIfMissing( [ error.message.key ] ).then( function () { - if ( !mw.message( error.message.key ).exists() ) { - return $.Deferred().reject(); - } - return new OO.ui.Error( - $( '

' ).msg( error.message.key, error.message.params || [] ), - { recoverable: false } - ); - } ); + // 'amenableparser' will expand templates and parser functions server-side. + // We still do the rest of wikitext parsing here (through jqueryMsg). + return api.loadMessagesIfMissing( [ error.message.key ], { amenableparser: true } ) + .then( function () { + if ( !mw.message( error.message.key ).exists() ) { + return $.Deferred().reject(); + } + return new OO.ui.Error( + $( '

' ).msg( error.message.key, error.message.params || [] ), + { recoverable: false } + ); + } ); } ) .then( null, function () { // We failed when loading the error message, or it doesn't actually exist, fall back diff --git a/resources/src/mediawiki/mediawiki.Upload.Dialog.js b/resources/src/mediawiki/mediawiki.Upload.Dialog.js index e8a85f1b51..9d9c0a61bf 100644 --- a/resources/src/mediawiki/mediawiki.Upload.Dialog.js +++ b/resources/src/mediawiki/mediawiki.Upload.Dialog.js @@ -29,6 +29,9 @@ * @uses mw.Upload * @uses mw.Upload.BookletLayout * @extends OO.ui.ProcessDialog + * + * @constructor + * @param {Object} [config] Configuration options * @cfg {Function} [bookletClass=mw.Upload.BookletLayout] Booklet class to be * used for the steps * @cfg {Object} [booklet] Booklet constructor configuration @@ -57,7 +60,6 @@ * @inheritdoc * @property title */ - /*jshint -W024*/ mw.Upload.Dialog.static.title = mw.msg( 'upload-dialog-title' ); /** @@ -69,7 +71,13 @@ flags: 'safe', action: 'cancel', label: mw.msg( 'upload-dialog-button-cancel' ), - modes: [ 'upload', 'insert', 'info' ] + modes: [ 'upload', 'insert' ] + }, + { + flags: 'safe', + action: 'cancelupload', + label: mw.msg( 'upload-dialog-button-back' ), + modes: [ 'info' ] }, { flags: [ 'primary', 'progressive' ], @@ -78,7 +86,7 @@ modes: 'insert' }, { - flags: [ 'primary', 'constructive' ], + flags: [ 'primary', 'progressive' ], label: mw.msg( 'upload-dialog-button-save' ), action: 'save', modes: 'info' @@ -91,8 +99,6 @@ } ]; - /*jshint +W024*/ - /* Methods */ /** @@ -119,6 +125,7 @@ * @return {mw.Upload.BookletLayout} An upload booklet */ mw.Upload.Dialog.prototype.createUploadBooklet = function () { + // eslint-disable-next-line new-cap return new this.bookletClass( $.extend( { $overlay: this.$overlay }, this.bookletConfig ) ); @@ -198,6 +205,9 @@ if ( action === 'cancel' ) { return new OO.ui.Process( this.close() ); } + if ( action === 'cancelupload' ) { + return new OO.ui.Process( this.uploadBooklet.initialize() ); + } return mw.Upload.Dialog.parent.prototype.getActionProcess.call( this, action ); }; diff --git a/resources/src/mediawiki/mediawiki.Upload.js b/resources/src/mediawiki/mediawiki.Upload.js index 23b0900e06..02df2a8890 100644 --- a/resources/src/mediawiki/mediawiki.Upload.js +++ b/resources/src/mediawiki/mediawiki.Upload.js @@ -2,8 +2,6 @@ var UP; /** - * @class mw.Upload - * * Used to represent an upload in progress on the frontend. * Most of the functionality is implemented in mw.Api.plugin.upload, * but this model class will tie it together as well as let you perform @@ -43,6 +41,8 @@ * } ); * } ); * + * @class mw.Upload + * * @constructor * @param {Object|mw.Api} [apiconfig] A mw.Api object (or subclass), or configuration * to pass to the constructor of mw.Api. diff --git a/resources/src/mediawiki/mediawiki.Uri.js b/resources/src/mediawiki/mediawiki.Uri.js index 835b423571..0c47dbe0a2 100644 --- a/resources/src/mediawiki/mediawiki.Uri.js +++ b/resources/src/mediawiki/mediawiki.Uri.js @@ -50,7 +50,11 @@ * @class mw.Uri */ +/* eslint-disable no-use-before-define */ + ( function ( mw, $ ) { + var parser, properties; + /** * Function that's useful when constructing the URI string -- we frequently encounter the pattern * of having to add something to the URI as we go, but only if it's present, and to include a @@ -83,10 +87,10 @@ * @static * @property {Object} parser */ - var parser = { + parser = { strict: mw.template.get( 'mediawiki.Uri', 'strict.regexp' ).render(), loose: mw.template.get( 'mediawiki.Uri', 'loose.regexp' ).render() - }, + }; /** * The order here matches the order of captured matches in the `parser` property regexes. @@ -139,6 +143,7 @@ * @param {string|Function} documentLocation A full url, or function returning one. * If passed a function, the return value may change over time and this will be honoured. (T74334) * @member mw + * @return {Function} Uri class */ mw.UriRelative = function ( documentLocation ) { var getDefaultUri = ( function () { diff --git a/resources/src/mediawiki/mediawiki.checkboxtoggle.js b/resources/src/mediawiki/mediawiki.checkboxtoggle.js index ab7a74e943..901f8751a6 100644 --- a/resources/src/mediawiki/mediawiki.checkboxtoggle.js +++ b/resources/src/mediawiki/mediawiki.checkboxtoggle.js @@ -39,4 +39,3 @@ } ); }( mediaWiki, jQuery ) ); - diff --git a/resources/src/mediawiki/mediawiki.confirmCloseWindow.js b/resources/src/mediawiki/mediawiki.confirmCloseWindow.js index 4d0c1352de..e3a8f7b20c 100644 --- a/resources/src/mediawiki/mediawiki.confirmCloseWindow.js +++ b/resources/src/mediawiki/mediawiki.confirmCloseWindow.js @@ -1,9 +1,5 @@ -/* jshint devel: true */ ( function ( mw, $ ) { /** - * @method confirmCloseWindow - * @member mw - * * Prevent the closing of a window with a confirm message (the onbeforeunload event seems to * work in most browsers.) * @@ -25,6 +21,8 @@ * // do whatever you wanted to do * } * + * @method confirmCloseWindow + * @member mw * @param {Object} [options] * @param {string} [options.namespace] Namespace for the event registration * @param {string} [options.message] @@ -109,4 +107,4 @@ } }; }; -} )( mediaWiki, jQuery ); +}( mediaWiki, jQuery ) ); diff --git a/resources/src/mediawiki/mediawiki.debug.init.js b/resources/src/mediawiki/mediawiki.debug.init.js deleted file mode 100644 index 0f85e80d6a..0000000000 --- a/resources/src/mediawiki/mediawiki.debug.init.js +++ /dev/null @@ -1,3 +0,0 @@ -jQuery( function () { - mediaWiki.Debug.init(); -} ); diff --git a/resources/src/mediawiki/mediawiki.debug.js b/resources/src/mediawiki/mediawiki.debug.js index f721009537..3c1a668064 100644 --- a/resources/src/mediawiki/mediawiki.debug.js +++ b/resources/src/mediawiki/mediawiki.debug.js @@ -190,9 +190,9 @@ } bitDiv( 'phpversion' ) - .append( $( this.data.phpEngine === 'HHVM' - ? 'HHVM' - : 'PHP' + .append( $( this.data.phpEngine === 'HHVM' ? + 'HHVM' : + 'PHP' ) ) .append( ': ' + this.data.phpVersion ); @@ -231,6 +231,8 @@ /** * Build the console panel + * + * @return {jQuery} Console panel */ buildConsoleTable: function () { var $table, entryTypeText, i, length, entry; @@ -282,9 +284,9 @@ $table = $( '

' ), - $row = $( '
' ), + $row = $( '
' ), - $td = $( '	' ), - $fieldLabelText = $( '' ), - $container; + $td = $( '	' ), + $fieldLabelText = $( '' ), + $container; if ( type === 'tr' ) { addMulti( $oldContainer, $td ); $container = $( '

<math><img src="some evil external link"><script>some_evil_javascript();</script></math>

<mw:toc><script>alert();</script></mw:toc>

!! end ### @@ -19014,7 +19138,7 @@ parsoid=wt2html,wt2wt,html2html

Ã®Ã®

!! end -# See: http://www.w3.org/TR/html5/syntax.html#character-references +# See: https://www.w3.org/TR/html5/syntax.html#character-references # Note that U+000C (form feed) is not a valid XML character, so # it is banned even though allowed in HTML5. !! test @@ -19388,9 +19512,11 @@ subpage title=[[Subpage test/L1/L2/L3]] parsoid=wt2html !! wikitext {{../../../../More than parent}} -!! html +!! html/php

+!! html/parsoid +

!! end !! test @@ -19777,18 +19903,18 @@ language=sr

!! end - !! test Simple category in language variants !! options language=sr cat !! wikitext [[Category:ÐÐµÐ´Ð¸Ð°WÐ¸ÐºÐ¸ Ð£ÑÐµÑ'Ñ ÐÑÐ¸Ð´Ðµ]] -!! html -MediaWiki User's Guide +!! html/php +cat=ÐÐµÐ´Ð¸Ð°WÐ¸ÐºÐ¸_Ð£ÑÐµÑ'Ñ_ÐÑÐ¸Ð´Ðµ sort= +!! html/parsoid + !! end - !! article Category:åç±» !! text @@ -19814,7 +19940,7 @@ parsoid=wt2html !! wikitext [[A]][[Category:åç±»]] !! html/php -åç±» +cat=åç±» sort= !! html/parsoid

@@ -20822,6 +20948,26 @@ Id starting with underscore !! end +!! test +Edit comment with link with more than one pipe (T99346) +!! options +comment +!! wikitext +[[Main Page|Many|pipes]] +!! html +Many|pipes +!! end + +!! test +Complex edit comment with link with more than one pipe (T99346) +!! options +comment +!! wikitext +Created page with "[[Category:Requests for permissions/Bot|{{subst:#titleparts:{{subst:PAGENAME}}|1|3}}]] === [[User:MineoBot|]] 8=== {{Request for permissions/links|Mineo..." +!! html +Created page with "<noinclude>{{subst:#titleparts:{{subst:PAGENAME}}|1|3}}</noinclude> === User:MineoBot 8=== {{Request for permissions/links|Mineo..." +!! end + !! test Space normalisation on autocomment (bug 22784) !! options @@ -21548,6 +21694,22 @@ __TOC__ !! end +!! test +T35715: s/strike element in ToC +!! wikitext +__TOC__ +== ~~test~~ test ~~test~~ == +!! html +

1 ~~test~~ test ~~test~~

+ +

test test test[edit]

+ +!! end + # Note that the html output does not have the

, but the # html+tidy output *does*. This is because the empty

is # removed by the sanitizer, but only when tidy is *not* enabled (!). @@ -24701,9 +24863,16 @@ Improperly nested inline or quotes tags with whitespace in between Encapsulate protected attributes from wt !! wikitext

foo

+ +{| typeof="mw:placeholder stuff" data-mw="whoo" data-parsoid="weird" data-parsoid-other="no" about="time" rel="mw:true" +| ok +|} !! html/parsoid -

foo

- +

foo

+ + + +

!!end ## Currently the p-wrapper is fragile in how it adds / removes transformations. @@ -27241,7 +27410,9 @@ Thumbnail output unclosed internal link XSS (T137264) !! wikitext [[#%3Cscript%3Ealert(1)%3C/script%3E| -!! html +!! html/php

[[#<script>alert(1)</script>|

+!! html/parsoid +

[[#%3Cscript%3Ealert(1)%3C/script%3E|

!! end diff --git a/tests/parser/parserTestsParserHook.php b/tests/parser/parserTestsParserHook.php deleted file mode 100644 index 5bf50ead6d..0000000000 --- a/tests/parser/parserTestsParserHook.php +++ /dev/null @@ -1,67 +0,0 @@ - - */ - -class ParserTestParserHook { - - static function setup( &$parser ) { - $parser->setHook( 'tag', [ __CLASS__, 'dumpHook' ] ); - $parser->setHook( 'tÃ¥g', [ __CLASS__, 'dumpHook' ] ); - $parser->setHook( 'statictag', [ __CLASS__, 'staticTagHook' ] ); - return true; - } - - static function dumpHook( $in, $argv ) { - return "

\n" .
-			var_export( $in, true ) . "\n" .
-			var_export( $argv, true ) . "\n" .
-			"

"; - } - - static function staticTagHook( $in, $argv, $parser ) { - if ( !count( $argv ) ) { - $parser->static_tag_buf = $in; - return ''; - } elseif ( count( $argv ) === 1 && isset( $argv['action'] ) - && $argv['action'] === 'flush' && $in === null - ) { - // Clear the buffer, we probably don't need to - if ( isset( $parser->static_tag_buf ) ) { - $tmp = $parser->static_tag_buf; - } else { - $tmp = ''; - } - $parser->static_tag_buf = null; - return $tmp; - } else { // wtf? - return - "\nCall this extension as string or as" . - " , not in any other way.\n" . - "text: " . var_export( $in, true ) . "\n" . - "argv: " . var_export( $argv, true ) . "\n"; - } - } -} diff --git a/tests/parserTests.php b/tests/parserTests.php deleted file mode 100644 index f961dd44ca..0000000000 --- a/tests/parserTests.php +++ /dev/null @@ -1,102 +0,0 @@ - - * https://www.mediawiki.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - * - * @file - * @ingroup Testing - */ - -define( 'MW_PARSER_TEST', true ); - -$options = [ 'quick', 'color', 'quiet', 'help', 'show-output', - 'record', 'run-disabled', 'run-parsoid', 'dwdiff', 'mark-ws' ]; -$optionsWithArgs = [ 'regex', 'filter', 'seed', 'setversion', 'file', 'norm' ]; - -require_once __DIR__ . '/../maintenance/commandLine.inc'; -require_once __DIR__ . '/TestsAutoLoader.php'; - -if ( isset( $options['help'] ) ) { - echo << Run test cases from a custom file instead of parserTests.txt - --record Record tests in database - --compare Compare with recorded results, without updating the database. - --setversion When using --record, set the version string to use (useful - with git-svn so that you can get the exact revision) - --keep-uploads Re-use the same upload directory for each test, don't delete it - --fuzz Do a fuzz test instead of a normal test - --seed Start the fuzz test from the specified seed - --run-disabled run disabled tests - --run-parsoid run parsoid tests (normally disabled) - --dwdiff Use dwdiff to display diff output - --mark-ws Mark whitespace in diffs by replacing it with symbols - --norm= Apply a comma-separated list of normalization functions to - both the expected and actual output in order to resolve - irrelevant differences. The accepted normalization functions - are: removeTbody to remove tags; and trimWhitespace - to trim whitespace from the start and end of text nodes. - --use-tidy-config Use the wiki's Tidy configuration instead of known-good - defaults. - --help Show this help message - -ENDS; - exit( 0 ); -} - -# Cases of weird db corruption were encountered when running tests on earlyish -# versions of SQLite -if ( $wgDBtype == 'sqlite' ) { - $db = wfGetDB( DB_MASTER ); - $version = $db->getServerVersion(); - if ( version_compare( $version, '3.6' ) < 0 ) { - die( "Parser tests require SQLite version 3.6 or later, you have $version\n" ); - } -} - -$tester = new ParserTest( $options ); - -if ( isset( $options['file'] ) ) { - $files = [ $options['file'] ]; -} else { - // Default parser tests and any set from extensions or local config - $files = $wgParserTestFiles; -} - -# Print out software version to assist with locating regressions -$version = SpecialVersion::getVersion( 'nodb' ); -echo "This is MediaWiki version {$version}.\n\n"; - -if ( isset( $options['fuzz'] ) ) { - $tester->fuzzTest( $files ); -} else { - $ok = $tester->runTestsFromFiles( $files ); - exit( $ok ? 0 : 1 ); -} diff --git a/tests/phpunit/Makefile b/tests/phpunit/Makefile index e1537bf5cc..d34e1836b2 100644 --- a/tests/phpunit/Makefile +++ b/tests/phpunit/Makefile @@ -43,26 +43,17 @@ coverage: parser: ${PU} --group Parser -parserfuzz: - @echo "******************************************************************" - @echo "* This WILL kill your computer by eating all memory AND all swap *" - @echo "* *" - @echo "* If you are on a production machine. ABORT NOW!! *" - @echo "* Press control+C to stop *" - @echo "* *" - @echo "******************************************************************" - ${PU} --group Parser,ParserFuzz noparser: - ${PU} --exclude-group Parser,Broken,ParserFuzz,Stub + ${PU} --exclude-group Parser,Broken,Stub safe: - ${PU} --exclude-group Broken,ParserFuzz,Destructive,Stub + ${PU} --exclude-group Broken,Destructive,Stub databaseless: - ${PU} --exclude-group Broken,ParserFuzz,Destructive,Database,Stub + ${PU} --exclude-group Broken,Destructive,Database,Stub database: - ${PU} --exclude-group Broken,ParserFuzz,Destructive,Stub --group Database + ${PU} --exclude-group Broken,Destructive,Stub --group Database list-groups: ${PU} --list-groups @@ -76,7 +67,7 @@ help: # tap Run the tests individually through Test::Harness's prove(1) # help You're looking at it! # coverage Run the tests and generates an HTML code coverage report - # You will need the Xdebug PHP extension for the later. + # You will need the Xdebug PHP extension for the latter. # [no]parser Skip or only run Parser tests # # list-groups List available Tests groups. diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index 27f1454dca..db1df5c04f 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -42,7 +42,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { /** * Primary database * - * @var DatabaseBase + * @var Database * @since 1.18 */ protected $db; @@ -56,7 +56,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { private static $useTemporaryTables = true; private static $reuseDB = false; private static $dbSetup = false; - private static $oldTablePrefix = false; + private static $oldTablePrefix = ''; /** * Original value of PHP's error_reporting setting. @@ -81,6 +81,13 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { */ private $mwGlobals = []; + /** + * Holds list of MediaWiki configuration settings to be unset in tearDown(). + * See also setMwGlobals(). + * @var array + */ + private $mwGlobalsToUnset = []; + /** * Holds original loggers which have been replaced by setLogger() * @var LoggerInterface[] @@ -122,9 +129,8 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { public static function setUpBeforeClass() { parent::setUpBeforeClass(); - // NOTE: Usually, PHPUnitMaintClass::finalSetup already called this, - // but let's make doubly sure. - self::prepareServices( new GlobalVarConfig() ); + // Get the service locator, and reset services if it's not done already + self::$serviceLocator = self::prepareServices( new GlobalVarConfig() ); } /** @@ -180,28 +186,26 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * * @param Config $bootstrapConfig The bootstrap config to use with the new * MediaWikiServices. Only used for the first call to this method. + * @return MediaWikiServices */ public static function prepareServices( Config $bootstrapConfig ) { - static $servicesPrepared = false; + static $services = null; - if ( $servicesPrepared ) { - return; - } else { - $servicesPrepared = true; + if ( !$services ) { + $services = self::resetGlobalServices( $bootstrapConfig ); } - - self::resetGlobalServices( $bootstrapConfig ); + return $services; } /** * Reset global services, and install testing environment. * This is the testing equivalent of MediaWikiServices::resetGlobalInstance(). * This should only be used to set up the testing environment, not when - * running unit tests. Use overrideMwServices() for that. + * running unit tests. Use MediaWikiTestCase::overrideMwServices() for that. * * @see MediaWikiServices::resetGlobalInstance() * @see prepareServices() - * @see overrideMwServices() + * @see MediaWikiTestCase::overrideMwServices() * * @param Config|null $bootstrapConfig The bootstrap config to use with the new * MediaWikiServices. @@ -214,11 +218,12 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { MediaWikiServices::resetGlobalInstance( $testConfig ); - self::$serviceLocator = MediaWikiServices::getInstance(); + $serviceLocator = MediaWikiServices::getInstance(); self::installTestServices( $oldConfigFactory, - self::$serviceLocator + $serviceLocator ); + return $serviceLocator; } /** @@ -244,7 +249,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * which we can't allow, as that would open a new connection for mysql. * Replace with a HashBag. They would not be going to persist anyway. */ - $hashCache = [ 'class' => 'HashBagOStuff' ]; + $hashCache = [ 'class' => 'HashBagOStuff', 'reportDupes' => false ]; $objectCaches = [ CACHE_DB => $hashCache, CACHE_ACCEL => $hashCache, @@ -256,6 +261,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { $defaultOverrides->set( 'ObjectCaches', $objectCaches ); $defaultOverrides->set( 'MainCacheType', CACHE_NONE ); + $defaultOverrides->set( 'JobTypeConf', [ 'default' => [ 'class' => 'JobQueueMemory' ] ] ); // Use a fast hash algorithm to hash passwords. $defaultOverrides->set( 'PasswordDefault', 'A' ); @@ -337,6 +343,10 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { JobQueueGroup::destroySingletons(); ObjectCache::clear(); + $services = MediaWikiServices::getInstance(); + $services->resetServiceForTesting( 'MainObjectStash' ); + $services->resetServiceForTesting( 'LocalServerObjectCache' ); + $services->getMainWANObjectCache()->clearProcessCache(); FileBackendGroup::destroySingleton(); // TODO: move global state into MediaWikiServices @@ -477,11 +487,20 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { while ( $this->db->trxLevel() > 0 ) { $this->db->rollback( __METHOD__, 'flush' ); } + // Check for unsafe queries + if ( $this->db->getType() === 'mysql' ) { + $this->db->query( "SET sql_mode = 'STRICT_ALL_TABLES'" ); + } } DeferredUpdates::clearPendingUpdates(); ObjectCache::getMainWANInstance()->clearProcessCache(); + // XXX: reset maintenance triggers + // Hook into period lag checks which often happen in long-running scripts + $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + Maintenance::setLBFactoryTriggers( $lbFactory ); + ob_start( 'MediaWikiTestCase::wfResetOutputBuffersBarrier' ); } @@ -490,7 +509,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { } protected function tearDown() { - global $wgRequest; + global $wgRequest, $wgSQLMode; $status = ob_get_status(); if ( isset( $status['name'] ) && @@ -514,13 +533,20 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { while ( $this->db->trxLevel() > 0 ) { $this->db->rollback( __METHOD__, 'flush' ); } + if ( $this->db->getType() === 'mysql' ) { + $this->db->query( "SET sql_mode = " . $this->db->addQuotes( $wgSQLMode ) ); + } } // Restore mw globals foreach ( $this->mwGlobals as $key => $value ) { $GLOBALS[$key] = $value; } + foreach ( $this->mwGlobalsToUnset as $value ) { + unset( $GLOBALS[$value] ); + } $this->mwGlobals = []; + $this->mwGlobalsToUnset = []; $this->restoreLoggers(); if ( self::$serviceLocator && MediaWikiServices::getInstance() !== self::$serviceLocator ) { @@ -669,8 +695,6 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * * @param array|string $globalKeys Key to the global variable, or an array of keys. * - * @throws Exception When trying to stash an unset global - * * @note To allow changes to global variables to take effect on global service instances, * call overrideMwServices(). * @@ -685,9 +709,13 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { // NOTE: make sure we only save the global once or a second call to // setMwGlobals() on the same global would override the original // value. - if ( !array_key_exists( $globalKey, $this->mwGlobals ) ) { + if ( + !array_key_exists( $globalKey, $this->mwGlobals ) && + !array_key_exists( $globalKey, $this->mwGlobalsToUnset ) + ) { if ( !array_key_exists( $globalKey, $GLOBALS ) ) { - throw new Exception( "Global with key {$globalKey} doesn't exist and cant be stashed" ); + $this->mwGlobalsToUnset[$globalKey] = $globalKey; + continue; } // NOTE: we serialize then unserialize the value in case it is an object // this stops any objects being passed by reference. We could use clone @@ -909,13 +937,22 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * * Should be called from addDBData(). * - * @since 1.25 - * @param string $pageName Page name + * @since 1.25 ($namespace in 1.28) + * @param string|title $pageName Page name or title * @param string $text Page's content + * @param int $namespace Namespace id (name cannot already contain namespace) * @return array Title object and page id */ - protected function insertPage( $pageName, $text = 'Sample page for unit test.' ) { - $title = Title::newFromText( $pageName, 0 ); + protected function insertPage( + $pageName, + $text = 'Sample page for unit test.', + $namespace = null + ) { + if ( is_string( $pageName ) ) { + $title = Title::newFromText( $pageName, $namespace ); + } else { + $title = $pageName; + } $user = static::getTestSysop()->getUser(); $comment = __METHOD__ . ': Sample page for unit test.'; @@ -1050,11 +1087,11 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * Clones all tables in the given database (whatever database that connection has * open), to versions with the test prefix. * - * @param DatabaseBase $db Database to use + * @param Database $db Database to use * @param string $prefix Prefix to use for test tables * @return bool True if tables were cloned, false if only the prefix was changed */ - protected static function setupDatabaseWithTestPrefix( DatabaseBase $db, $prefix ) { + protected static function setupDatabaseWithTestPrefix( Database $db, $prefix ) { $tablesCloned = self::listTables( $db ); $dbClone = new CloneDatabase( $db, $tablesCloned, $prefix ); $dbClone->useTemporaryTables( self::$useTemporaryTables ); @@ -1103,23 +1140,23 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * @note this method only works when first called. Subsequent calls have no effect, * even if using different parameters. * - * @param DatabaseBase $db The database connection + * @param Database $db The database connection * @param string $prefix The prefix to use for the new table set (aka schema). * * @throws MWException If the database table prefix is already $prefix */ - public static function setupTestDB( DatabaseBase $db, $prefix ) { + public static function setupTestDB( Database $db, $prefix ) { + if ( self::$dbSetup ) { + return; + } + if ( $db->tablePrefix() === $prefix ) { throw new MWException( 'Cannot run unit tests, the database prefix is already "' . $prefix . '"' ); } - if ( self::$dbSetup ) { - return; - } - // TODO: the below should be re-written as soon as LBFactory, LoadBalancer, - // and DatabaseBase no longer use global state. + // and Database no longer use global state. self::$dbSetup = true; @@ -1158,19 +1195,23 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * Gets master database connections for all of the ExternalStoreDB * stores configured in $wgDefaultExternalStore. * - * @return array Array of DatabaseBase master connections + * @return Database[] Array of Database master connections */ protected static function getExternalStoreDatabaseConnections() { global $wgDefaultExternalStore; + /** @var ExternalStoreDB $externalStoreDB */ $externalStoreDB = ExternalStore::getStoreObject( 'DB' ); - $defaultArray = (array) $wgDefaultExternalStore; + $defaultArray = (array)$wgDefaultExternalStore; $dbws = []; foreach ( $defaultArray as $url ) { if ( strpos( $url, 'DB://' ) === 0 ) { list( $proto, $cluster ) = explode( '://', $url, 2 ); - $dbw = $externalStoreDB->getMaster( $cluster ); + // Avoid getMaster() because setupDatabaseWithTestPrefix() + // requires Database instead of plain DBConnRef/IDatabase + $lb = $externalStoreDB->getLoadBalancer( $cluster ); + $dbw = $lb->getConnection( DB_MASTER ); $dbws[] = $dbw; } } @@ -1189,7 +1230,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { return false; } - $defaultArray = (array) $wgDefaultExternalStore; + $defaultArray = (array)$wgDefaultExternalStore; foreach ( $defaultArray as $url ) { if ( strpos( $url, 'DB://' ) === 0 ) { return true; @@ -1202,7 +1243,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { /** * Empty all tables so they can be repopulated for tests * - * @param DatabaseBase $db|null Database to reset + * @param Database $db|null Database to reset * @param array $tablesUsed Tables to reset */ private function resetDB( $db, $tablesUsed ) { @@ -1285,18 +1326,21 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { /** * @since 1.18 * - * @param DatabaseBase $db + * @param Database $db * * @return array */ - public static function listTables( $db ) { + public static function listTables( Database $db ) { $prefix = $db->tablePrefix(); $tables = $db->listTables( $prefix, __METHOD__ ); if ( $db->getType() === 'mysql' ) { - # bug 43571: cannot clone VIEWs under MySQL - $views = $db->listViews( $prefix, __METHOD__ ); - $tables = array_diff( $tables, $views ); + static $viewListCache = null; + if ( $viewListCache === null ) { + $viewListCache = $db->listViews( null, __METHOD__ ); + } + // T45571: cannot clone VIEWs under MySQL + $tables = array_diff( $tables, $viewListCache ); } array_walk( $tables, [ __CLASS__, 'unprefixTable' ], $prefix ); diff --git a/tests/phpunit/ResourceLoaderTestCase.php b/tests/phpunit/ResourceLoaderTestCase.php index 18a49f60bd..baa481e51c 100644 --- a/tests/phpunit/ResourceLoaderTestCase.php +++ b/tests/phpunit/ResourceLoaderTestCase.php @@ -1,9 +1,15 @@ setConstructorArgs( [ $resourceLoader, $request ] ) ->setMethods( [ 'getDirection' ] ) ->getMock(); - $ctx->expects( $this->any() )->method( 'getDirection' )->will( - $this->returnValue( $dir ) - ); + $ctx->method( 'getDirection' )->willReturn( $dir ); return $ctx; } @@ -137,7 +141,7 @@ class EmptyResourceLoader extends ResourceLoader { // and default registrations are done from ServiceWiring instead. public function __construct( Config $config = null, LoggerInterface $logger = null ) { $this->setLogger( $logger ?: new NullLogger() ); - $this->config = $config ?: ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); + $this->config = $config ?: MediaWikiServices::getInstance()->getMainConfig(); $this->setMessageBlobStore( new MessageBlobStore( $this, $this->getLogger() ) ); } } diff --git a/tests/phpunit/data/upload/buggynamespace-bad.svg b/tests/phpunit/data/upload/buggynamespace-bad.svg new file mode 100644 index 0000000000..974fac0623 --- /dev/null +++ b/tests/phpunit/data/upload/buggynamespace-bad.svg @@ -0,0 +1,24 @@ + + + + diff --git a/tests/phpunit/data/upload/buggynamespace-evilhtml.svg b/tests/phpunit/data/upload/buggynamespace-evilhtml.svg new file mode 100644 index 0000000000..f4be479ed8 --- /dev/null +++ b/tests/phpunit/data/upload/buggynamespace-evilhtml.svg @@ -0,0 +1,12 @@ + + + +]> + +

foo

+ diff --git a/tests/phpunit/data/upload/buggynamespace-okay.svg b/tests/phpunit/data/upload/buggynamespace-okay.svg new file mode 100644 index 0000000000..4a5c6aae23 --- /dev/null +++ b/tests/phpunit/data/upload/buggynamespace-okay.svg @@ -0,0 +1,52 @@ + + + + \ No newline at end of file diff --git a/tests/phpunit/data/upload/buggynamespace-okay2.svg b/tests/phpunit/data/upload/buggynamespace-okay2.svg new file mode 100644 index 0000000000..fe42310f63 --- /dev/null +++ b/tests/phpunit/data/upload/buggynamespace-okay2.svg @@ -0,0 +1,52 @@ + + + + \ No newline at end of file diff --git a/tests/phpunit/data/upload/buggynamespace-original.svg b/tests/phpunit/data/upload/buggynamespace-original.svg new file mode 100644 index 0000000000..c61c91cfd8 --- /dev/null +++ b/tests/phpunit/data/upload/buggynamespace-original.svg @@ -0,0 +1,33 @@ + + + + + + + + + + +]> + diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php index c259a51781..5a01dc006f 100644 --- a/tests/phpunit/includes/EditPageTest.php +++ b/tests/phpunit/includes/EditPageTest.php @@ -348,6 +348,8 @@ class EditPageTest extends MediaWikiLangTestCase { wfGetDB( DB_MASTER )->commit( __METHOD__ ); + $this->assertEquals( 0, DeferredUpdates::pendingUpdatesCount(), 'No deferred updates' ); + if ( $expectedCode != EditPage::AS_BLANK_ARTICLE ) { $latest = $page->getLatest(); $page->doDeleteArticleReal( $pageTitle ); diff --git a/tests/phpunit/includes/FauxRequestTest.php b/tests/phpunit/includes/FauxRequestTest.php index 4622a38400..e3713ab7fe 100644 --- a/tests/phpunit/includes/FauxRequestTest.php +++ b/tests/phpunit/includes/FauxRequestTest.php @@ -1,8 +1,162 @@ setExpectedException( MWException::class, 'bogus data' ); + $req = new FauxRequest( 'x' ); + } + + /** + * @covers FauxRequest::__construct + */ + public function testConstructInvalidSession() { + $this->setExpectedException( MWException::class, 'bogus session' ); + $req = new FauxRequest( [], false, 'x' ); + } + + /** + * @covers FauxRequest::getText + */ + public function testGetText() { + $req = new FauxRequest( [ 'x' => 'Value' ] ); + $this->assertEquals( 'Value', $req->getText( 'x' ) ); + $this->assertEquals( '', $req->getText( 'z' ) ); + } + + // Integration test for parent method. + public function testGetVal() { + $req = new FauxRequest( [ 'crlf' => "A\r\nb" ] ); + $this->assertSame( "A\r\nb", $req->getVal( 'crlf' ), 'CRLF' ); + } + + // Integration test for parent method. + public function testGetRawVal() { + $req = new FauxRequest( [ + 'x' => 'Value', + 'y' => [ 'a' ], + 'crlf' => "A\r\nb" + ] ); + $this->assertSame( 'Value', $req->getRawVal( 'x' ) ); + $this->assertSame( null, $req->getRawVal( 'z' ), 'Not found' ); + $this->assertSame( null, $req->getRawVal( 'y' ), 'Array is ignored' ); + $this->assertSame( "A\r\nb", $req->getRawVal( 'crlf' ), 'CRLF' ); + } + + /** + * @covers FauxRequest::getValues + */ + public function testGetValues() { + $values = [ 'x' => 'Value', 'y' => '' ]; + $req = new FauxRequest( $values ); + $this->assertEquals( $values, $req->getValues() ); + } + + /** + * @covers FauxRequest::getQueryValues + */ + public function testGetQueryValues() { + $values = [ 'x' => 'Value', 'y' => '' ]; + + $req = new FauxRequest( $values ); + $this->assertEquals( $values, $req->getQueryValues() ); + $req = new FauxRequest( $values, /*wasPosted*/ true ); + $this->assertEquals( [], $req->getQueryValues() ); + } + + /** + * @covers FauxRequest::getMethod + */ + public function testGetMethod() { + $req = new FauxRequest( [] ); + $this->assertEquals( 'GET', $req->getMethod() ); + $req = new FauxRequest( [], /*wasPosted*/ true ); + $this->assertEquals( 'POST', $req->getMethod() ); + } + + /** + * @covers FauxRequest::wasPosted + */ + public function testWasPosted() { + $req = new FauxRequest( [] ); + $this->assertFalse( $req->wasPosted() ); + $req = new FauxRequest( [], /*wasPosted*/ true ); + $this->assertTrue( $req->wasPosted() ); + } + + /** + * @covers FauxRequest::getCookie + * @covers FauxRequest::setCookie + * @covers FauxRequest::setCookies + */ + public function testCookies() { + $req = new FauxRequest(); + $this->assertSame( null, $req->getCookie( 'z', '' ) ); + + $req->setCookie( 'x', 'Value', '' ); + $this->assertEquals( 'Value', $req->getCookie( 'x', '' ) ); + + $req->setCookies( [ 'x' => 'One', 'y' => 'Two' ], '' ); + $this->assertEquals( 'One', $req->getCookie( 'x', '' ) ); + $this->assertEquals( 'Two', $req->getCookie( 'y', '' ) ); + } + + /** + * @covers FauxRequest::getCookie + * @covers FauxRequest::setCookie + * @covers FauxRequest::setCookies + */ + public function testCookiesDefaultPrefix() { + global $wgCookiePrefix; + $oldPrefix = $wgCookiePrefix; + $wgCookiePrefix = '_'; + + $req = new FauxRequest(); + $this->assertSame( null, $req->getCookie( 'z' ) ); + + $req->setCookie( 'x', 'Value' ); + $this->assertEquals( 'Value', $req->getCookie( 'x' ) ); + + $wgCookiePrefix = $oldPrefix; + } + + /** + * @covers FauxRequest::getRequestURL + */ + public function testGetRequestURL() { + $req = new FauxRequest(); + $this->setExpectedException( MWException::class ); + $req->getRequestURL(); + } + + /** + * @covers FauxRequest::setRequestURL + * @covers FauxRequest::getRequestURL + */ + public function testSetRequestURL() { + $req = new FauxRequest(); + $req->setRequestURL( 'https://example.org' ); + $this->assertEquals( 'https://example.org', $req->getRequestURL() ); + } + + /** + * @covers FauxRequest::__construct + * @covers FauxRequest::getProtocol + */ + public function testProtocol() { + $req = new FauxRequest(); + $this->assertEquals( 'http', $req->getProtocol() ); + $req = new FauxRequest( [], false, null, 'http' ); + $this->assertEquals( 'http', $req->getProtocol() ); + $req = new FauxRequest( [], false, null, 'https' ); + $this->assertEquals( 'https', $req->getProtocol() ); + } + /** * @covers FauxRequest::setHeader + * @covers FauxRequest::setHeaders * @covers FauxRequest::getHeader */ public function testGetSetHeader() { @@ -22,7 +176,7 @@ class FauxRequestTest extends MediaWikiTestCase { } /** - * @covers FauxRequest::getAllHeaders + * @covers FauxRequest::initHeaders */ public function testGetAllHeaders() { $_SERVER['HTTP_TEST'] = 'Example'; @@ -33,19 +187,36 @@ class FauxRequestTest extends MediaWikiTestCase { [], $request->getAllHeaders() ); + + $this->assertEquals( + false, + $request->getHeader( 'test' ) + ); } /** - * @covers FauxRequest::getHeader + * @covers FauxRequest::__construct + * @covers FauxRequest::getSessionArray */ - public function testGetHeader() { - $_SERVER['HTTP_TEST'] = 'Example'; + public function testSessionData() { + $values = [ 'x' => 'Value', 'y' => '' ]; - $request = new FauxRequest(); + $req = new FauxRequest( [], false, /*session*/ $values ); + $this->assertEquals( $values, $req->getSessionArray() ); - $this->assertEquals( - false, - $request->getHeader( 'test' ) - ); + $req = new FauxRequest(); + $this->assertSame( null, $req->getSessionArray() ); + } + + /** + * @covers FauxRequest::getRawQueryString + * @covers FauxRequest::getRawPostString + * @covers FauxRequest::getRawInput + */ + public function testDummies() { + $req = new FauxRequest(); + $this->assertEquals( '', $req->getRawQueryString() ); + $this->assertEquals( '', $req->getRawPostString() ); + $this->assertEquals( '', $req->getRawInput() ); } } diff --git a/tests/phpunit/includes/FormOptionsTest.php b/tests/phpunit/includes/FormOptionsTest.php index 5c4d1c05d7..e491d610c1 100644 --- a/tests/phpunit/includes/FormOptionsTest.php +++ b/tests/phpunit/includes/FormOptionsTest.php @@ -52,6 +52,9 @@ class FormOptionsTest extends MediaWikiTestCase { private function assertGuessString( $data ) { $this->guess( FormOptions::STRING, $data ); } + private function assertGuessArray( $data ) { + $this->guess( FormOptions::ARR, $data ); + } /** Generic helper */ private function guess( $expected, $data ) { @@ -84,15 +87,10 @@ class FormOptionsTest extends MediaWikiTestCase { $this->assertGuessString( '5' ); $this->assertGuessString( '0' ); $this->assertGuessString( '1.5' ); - } - /** - * @expectedException MWException - * @covers FormOptions::guessType - */ - public function testGuessTypeOnArrayThrowException() { - $this->object->guessType( [ 'foo' ] ); + $this->assertGuessArray( [ 'foo' ] ); } + /** * @expectedException MWException * @covers FormOptions::guessType diff --git a/tests/phpunit/includes/GitInfoTest.php b/tests/phpunit/includes/GitInfoTest.php index 9f4a01c9d8..89416f2ff2 100644 --- a/tests/phpunit/includes/GitInfoTest.php +++ b/tests/phpunit/includes/GitInfoTest.php @@ -18,7 +18,6 @@ class GitInfoTest extends MediaWikiTestCase { $this->assertEquals( 'master', $gitInfo->getCurrentBranch() ); $this->assertContains( '0123456789abcdef0123456789abcdef01234567', $gitInfo->getHeadViewUrl() ); - } public function testValidJsonData() { diff --git a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php index c76666d36d..8fbca6cfe3 100644 --- a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php +++ b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php @@ -11,7 +11,7 @@ class WfBCP47Test extends MediaWikiTestCase { * This test is used to verify our formatting against all lower and * all upper cases language code. * - * @see http://tools.ietf.org/html/bcp47 + * @see https://tools.ietf.org/html/bcp47 * @dataProvider provideLanguageCodes() */ public function testBCP47( $code, $expected ) { diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php index e44db83b44..e2ee193416 100644 --- a/tests/phpunit/includes/HtmlTest.php +++ b/tests/phpunit/includes/HtmlTest.php @@ -92,7 +92,6 @@ class HtmlTest extends MediaWikiTestCase { * @covers Html::expandAttributes */ public function testExpandAttributesSkipsNullAndFalse() { - # ## EMPTY ######## $this->assertEmpty( Html::expandAttributes( [ 'foo' => null ] ), @@ -190,7 +189,6 @@ class HtmlTest extends MediaWikiTestCase { Html::expandAttributes( [ 'zero' => 0 ] ), 'Number 0 value needs no quotes' ); - } /** @@ -271,7 +269,7 @@ class HtmlTest extends MediaWikiTestCase { /** * How do we handle duplicate keys in HTML attributes expansion? * We could pass a "class" the values: 'GREEN' and array( 'GREEN' => false ) - * The later will take precedence. + * The latter will take precedence. * * Feature added by r96188 * @covers Html::expandAttributes @@ -447,7 +445,7 @@ class HtmlTest extends MediaWikiTestCase { /** * List of input element types values introduced by HTML5 - * Full list at http://www.w3.org/TR/html-markup/input.html + * Full list at https://www.w3.org/TR/html-markup/input.html */ public static function provideHtml5InputTypes() { $types = [ @@ -514,10 +512,6 @@ class HtmlTest extends MediaWikiTestCase { 'canvas', [ 'width' => 300 ] ]; - $cases[] = [ '', - 'command', [ 'type' => 'command' ] - ]; - $cases[] = [ '', 'form', [ 'action' => 'GET' ] ]; diff --git a/tests/phpunit/includes/HttpTest.php b/tests/phpunit/includes/HttpTest.php index ae0b4bee8b..c3804c65bb 100644 --- a/tests/phpunit/includes/HttpTest.php +++ b/tests/phpunit/includes/HttpTest.php @@ -188,7 +188,7 @@ class HttpTest extends MediaWikiTestCase { /** * Constant values are from PHP 5.3.28 using cURL 7.24.0 - * @see http://php.net/manual/en/curl.constants.php + * @see https://secure.php.net/manual/en/curl.constants.php * * All constant values are present so that developers donât need to remember * to add them if added at a later date. The commented out constants were diff --git a/tests/phpunit/includes/LinkFilterTest.php b/tests/phpunit/includes/LinkFilterTest.php index 61b165a4dc..428b0129a0 100644 --- a/tests/phpunit/includes/LinkFilterTest.php +++ b/tests/phpunit/includes/LinkFilterTest.php @@ -6,7 +6,6 @@ class LinkFilterTest extends MediaWikiLangTestCase { protected function setUp() { - parent::setUp(); $this->setMwGlobals( 'wgUrlProtocols', [ @@ -26,7 +25,6 @@ class LinkFilterTest extends MediaWikiLangTestCase { 'mms://', '//', ] ); - } /** @@ -38,11 +36,9 @@ class LinkFilterTest extends MediaWikiLangTestCase { * @return string Regex */ function createRegexFromLIKE( $like ) { - $regex = '!^'; foreach ( $like as $item ) { - if ( $item instanceof LikeMatch ) { if ( $item->toString() == '%' ) { $regex .= '.*'; @@ -58,7 +54,6 @@ class LinkFilterTest extends MediaWikiLangTestCase { $regex .= '$!'; return $regex; - } /** @@ -67,7 +62,6 @@ class LinkFilterTest extends MediaWikiLangTestCase { * @return array */ public static function provideValidPatterns() { - return [ // Protocol, Search pattern, URL which matches the pattern [ 'http://', '*.test.com', 'http://www.test.com' ], @@ -164,7 +158,6 @@ class LinkFilterTest extends MediaWikiLangTestCase { // [ '', 'https://*.wikimedia.org/r/#/q/status:open,n,z', // 'https://gerrit.wikimedia.org/XXX/r/#/q/status:open,n,z', false ], ]; - } /** @@ -181,7 +174,6 @@ class LinkFilterTest extends MediaWikiLangTestCase { * @param bool $shouldBeFound Should the URL be found? (defaults true) */ function testMakeLikeArrayWithValidPatterns( $protocol, $pattern, $url, $shouldBeFound = true ) { - $indexes = wfMakeUrlIndexes( $url ); $likeArray = LinkFilter::makeLikeArray( $pattern, $protocol ); @@ -211,7 +203,6 @@ class LinkFilterTest extends MediaWikiLangTestCase { "Search pattern '$protocol$pattern' should not find url '$url' \n$debugmsg" ); } - } /** @@ -220,7 +211,6 @@ class LinkFilterTest extends MediaWikiLangTestCase { * @return array */ public static function provideInvalidPatterns() { - return [ [ '' ], [ '*' ], @@ -240,7 +230,6 @@ class LinkFilterTest extends MediaWikiLangTestCase { [ 'test.com/*/index' ], [ 'test.com/dir/index?arg=*' ], ]; - } /** @@ -253,12 +242,10 @@ class LinkFilterTest extends MediaWikiLangTestCase { * @param string $pattern Invalid search pattern */ function testMakeLikeArrayWithInvalidPatterns( $pattern ) { - $this->assertFalse( LinkFilter::makeLikeArray( $pattern ), "'$pattern' is not a valid pattern and should be rejected" ); - } } diff --git a/tests/phpunit/includes/LinkerTest.php b/tests/phpunit/includes/LinkerTest.php index 63753f9ef3..3edf99f2e2 100644 --- a/tests/phpunit/includes/LinkerTest.php +++ b/tests/phpunit/includes/LinkerTest.php @@ -37,34 +37,34 @@ class LinkerTest extends MediaWikiLangTestCase { [ 'JohnDoe', + . 'title="Special:Contributions/JohnDoe">JohnDoe', 0, 'JohnDoe', false, ], [ '::1', + . 'title="Special:Contributions/::1">::1', 0, '::1', false, 'Anonymous with pretty IPv6' ], [ '::1', + . 'title="Special:Contributions/0:0:0:0:0:0:0:1">::1', 0, '0:0:0:0:0:0:0:1', false, 'Anonymous with almost pretty IPv6' ], [ '::1', + . 'title="Special:Contributions/0000:0000:0000:0000:0000:0000:0000:0001">::1', 0, '0000:0000:0000:0000:0000:0000:0000:0001', false, 'Anonymous with full IPv6' ], [ 'AlternativeUsername', + . 'title="Special:Contributions/::1">AlternativeUsername', 0, '::1', 'AlternativeUsername', 'Anonymous with pretty IPv6 and an alternative username' ], @@ -73,14 +73,14 @@ class LinkerTest extends MediaWikiLangTestCase { [ '127.0.0.1', + . 'title="Special:Contributions/127.0.0.1">127.0.0.1', 0, '127.0.0.1', false, 'Anonymous with IPv4' ], [ 'AlternativeUsername', + . 'title="Special:Contributions/127.0.0.1">AlternativeUsername', 0, '127.0.0.1', 'AlternativeUsername', 'Anonymous with IPv4 and an alternative username' ], diff --git a/tests/phpunit/includes/MWTimestampTest.php b/tests/phpunit/includes/MWTimestampTest.php index 70e4aeab4a..4bca4788ac 100644 --- a/tests/phpunit/includes/MWTimestampTest.php +++ b/tests/phpunit/includes/MWTimestampTest.php @@ -4,7 +4,6 @@ * Tests timestamp parsing and output. */ class MWTimestampTest extends MediaWikiLangTestCase { - protected function setUp() { parent::setUp(); @@ -12,128 +11,6 @@ class MWTimestampTest extends MediaWikiLangTestCase { $this->setMwGlobals( 'wgHooks', [] ); } - /** - * @covers MWTimestamp::__construct - */ - public function testConstructWithNoTimestamp() { - $timestamp = new MWTimestamp(); - $this->assertInternalType( 'string', $timestamp->getTimestamp() ); - $this->assertNotEmpty( $timestamp->getTimestamp() ); - $this->assertNotEquals( false, strtotime( $timestamp->getTimestamp( TS_MW ) ) ); - } - - /** - * @covers MWTimestamp::__toString - */ - public function testToString() { - $timestamp = new MWTimestamp( '1406833268' ); // Equivalent to 20140731190108 - $this->assertEquals( '1406833268', $timestamp->__toString() ); - } - - public static function provideValidTimestampDifferences() { - return [ - [ '1406833268', '1406833269', '00 00 00 01' ], - [ '1406833268', '1406833329', '00 00 01 01' ], - [ '1406833268', '1406836929', '00 01 01 01' ], - [ '1406833268', '1406923329', '01 01 01 01' ], - ]; - } - - /** - * @dataProvider provideValidTimestampDifferences - * @covers MWTimestamp::diff - */ - public function testDiff( $timestamp1, $timestamp2, $expected ) { - $timestamp1 = new MWTimestamp( $timestamp1 ); - $timestamp2 = new MWTimestamp( $timestamp2 ); - $diff = $timestamp1->diff( $timestamp2 ); - $this->assertEquals( $expected, $diff->format( '%D %H %I %S' ) ); - } - - /** - * Test parsing of valid timestamps and outputing to MW format. - * @dataProvider provideValidTimestamps - * @covers MWTimestamp::getTimestamp - */ - public function testValidParse( $format, $original, $expected ) { - $timestamp = new MWTimestamp( $original ); - $this->assertEquals( $expected, $timestamp->getTimestamp( TS_MW ) ); - } - - /** - * Test outputting valid timestamps to different formats. - * @dataProvider provideValidTimestamps - * @covers MWTimestamp::getTimestamp - */ - public function testValidOutput( $format, $expected, $original ) { - $timestamp = new MWTimestamp( $original ); - $this->assertEquals( $expected, (string)$timestamp->getTimestamp( $format ) ); - } - - /** - * Test an invalid timestamp. - * @expectedException TimestampException - * @covers MWTimestamp - */ - public function testInvalidParse() { - new MWTimestamp( "This is not a timestamp." ); - } - - /** - * Test an out of range timestamp - * @dataProvider provideOutOfRangeTimestamps - * @expectedException TimestampException - * @covers MWTimestamp - */ - public function testOutOfRangeTimestamps( $format, $input ) { - $timestamp = new MWTimestamp( $input ); - $timestamp->getTimestamp( $format ); - } - - /** - * Test requesting an invalid output format. - * @expectedException TimestampException - * @covers MWTimestamp::getTimestamp - */ - public function testInvalidOutput() { - $timestamp = new MWTimestamp( '1343761268' ); - $timestamp->getTimestamp( 98 ); - } - - /** - * Returns a list of valid timestamps in the format: - * [ type, timestamp_of_type, timestamp_in_MW ] - */ - public static function provideValidTimestamps() { - return [ - // Various formats - [ TS_UNIX, '1343761268', '20120731190108' ], - [ TS_MW, '20120731190108', '20120731190108' ], - [ TS_DB, '2012-07-31 19:01:08', '20120731190108' ], - [ TS_ISO_8601, '2012-07-31T19:01:08Z', '20120731190108' ], - [ TS_ISO_8601_BASIC, '20120731T190108Z', '20120731190108' ], - [ TS_EXIF, '2012:07:31 19:01:08', '20120731190108' ], - [ TS_RFC2822, 'Tue, 31 Jul 2012 19:01:08 GMT', '20120731190108' ], - [ TS_ORACLE, '31-07-2012 19:01:08.000000', '20120731190108' ], - [ TS_POSTGRES, '2012-07-31 19:01:08 GMT', '20120731190108' ], - // Some extremes and weird values - [ TS_ISO_8601, '9999-12-31T23:59:59Z', '99991231235959' ], - [ TS_UNIX, '-62135596801', '00001231235959' ] - ]; - } - - /** - * Returns a list of out of range timestamps in the format: - * [ type, timestamp_of_type ] - */ - public static function provideOutOfRangeTimestamps() { - return [ - // Various formats - [ TS_MW, '-62167219201' ], // -0001-12-31T23:59:59Z - [ TS_MW, '253402300800' ], // 10000-01-01T00:00:00Z - ]; - } - /** * @dataProvider provideHumanTimestampTests * @covers MWTimestamp::getHumanTimestamp diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php index 8c2b143e80..dc0c64c4f6 100644 --- a/tests/phpunit/includes/MediaWikiServicesTest.php +++ b/tests/phpunit/includes/MediaWikiServicesTest.php @@ -147,9 +147,6 @@ class MediaWikiServicesTest extends MediaWikiTestCase { ->disableOriginalConstructor() ->getMock(); - $lbFactory->expects( $this->once() ) - ->method( 'destroy' ); - $newServices->redefineService( 'DBLoadBalancerFactory', function() use ( $lbFactory ) { @@ -164,12 +161,11 @@ class MediaWikiServicesTest extends MediaWikiTestCase { try { MediaWikiServices::getInstance()->getService( 'DBLoadBalancerFactory' ); - $this->fail( 'DBLoadBalancerFactory shoudl have been disabled' ); + $this->fail( 'DBLoadBalancerFactory should have been disabled' ); } catch ( ServiceDisabledException $ex ) { // ok, as expected - } - catch ( Throwable $ex ) { + } catch ( Throwable $ex ) { $this->fail( 'ServiceDisabledException expected, caught ' . get_class( $ex ) ); } @@ -316,14 +312,22 @@ class MediaWikiServicesTest extends MediaWikiTestCase { 'DBLoadBalancer' => [ 'DBLoadBalancer', 'LoadBalancer' ], 'WatchedItemStore' => [ 'WatchedItemStore', WatchedItemStore::class ], 'WatchedItemQueryService' => [ 'WatchedItemQueryService', WatchedItemQueryService::class ], + 'CryptRand' => [ 'CryptRand', CryptRand::class ], + 'CryptHKDF' => [ 'CryptHKDF', CryptHKDF::class ], 'MediaHandlerFactory' => [ 'MediaHandlerFactory', MediaHandlerFactory::class ], + 'Parser' => [ 'Parser', Parser::class ], 'GenderCache' => [ 'GenderCache', GenderCache::class ], 'LinkCache' => [ 'LinkCache', LinkCache::class ], 'LinkRenderer' => [ 'LinkRenderer', LinkRenderer::class ], 'LinkRendererFactory' => [ 'LinkRendererFactory', LinkRendererFactory::class ], '_MediaWikiTitleCodec' => [ '_MediaWikiTitleCodec', MediaWikiTitleCodec::class ], + 'MimeAnalyzer' => [ 'MimeAnalyzer', MimeAnalyzer::class ], 'TitleFormatter' => [ 'TitleFormatter', TitleFormatter::class ], 'TitleParser' => [ 'TitleParser', TitleParser::class ], + 'ProxyLookup' => [ 'ProxyLookup', ProxyLookup::class ], + 'MainObjectStash' => [ 'MainObjectStash', BagOStuff::class ], + 'MainWANObjectCache' => [ 'MainWANObjectCache', WANObjectCache::class ], + 'LocalServerObjectCache' => [ 'LocalServerObjectCache', BagOStuff::class ], 'VirtualRESTServiceClient' => [ 'VirtualRESTServiceClient', VirtualRESTServiceClient::class ] ]; } diff --git a/tests/phpunit/includes/MediaWikiTest.php b/tests/phpunit/includes/MediaWikiTest.php index df92012e29..a8d1e33950 100644 --- a/tests/phpunit/includes/MediaWikiTest.php +++ b/tests/phpunit/includes/MediaWikiTest.php @@ -34,7 +34,7 @@ class MediaWikiTest extends MediaWikiTestCase { 'url' => 'http://example.org/w/index.php?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Script path with implicit title from page id @@ -76,21 +76,21 @@ class MediaWikiTest extends MediaWikiTestCase { 'url' => 'http://example.org/w/?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Root path with escaped title 'url' => 'http://example.org/?title=Foo_Bar', 'query' => [ 'title' => 'Foo_Bar' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // View: Canonical with redundant query 'url' => 'http://example.org/wiki/Foo_Bar?action=view', 'query' => [ 'action' => 'view' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // Edit: Canonical view url with action query @@ -104,7 +104,7 @@ class MediaWikiTest extends MediaWikiTestCase { 'url' => 'http://example.org/w/index.php?title=Foo_Bar&action=view', 'query' => [ 'title' => 'Foo_Bar', 'action' => 'view' ], 'title' => 'Foo_Bar', - 'redirect' => 'http://example.org/wiki/Foo_Bar', + 'redirect' => false, ], [ // Edit: Index with action query diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php index 4c689abb04..e8afb4ccee 100644 --- a/tests/phpunit/includes/MessageTest.php +++ b/tests/phpunit/includes/MessageTest.php @@ -18,8 +18,8 @@ class MessageTest extends MediaWikiLangTestCase { public function testConstructor( $expectedLang, $key, $params, $language ) { $message = new Message( $key, $params, $language ); - $this->assertEquals( $key, $message->getKey() ); - $this->assertEquals( $params, $message->getParams() ); + $this->assertSame( $key, $message->getKey() ); + $this->assertSame( $params, $message->getParams() ); $this->assertEquals( $expectedLang, $message->getLanguage() ); $messageSpecifier = $this->getMockForAbstractClass( 'MessageSpecifier' ); @@ -29,8 +29,8 @@ class MessageTest extends MediaWikiLangTestCase { ->method( 'getParams' )->will( $this->returnValue( $params ) ); $message = new Message( $messageSpecifier, [], $language ); - $this->assertEquals( $key, $message->getKey() ); - $this->assertEquals( $params, $message->getParams() ); + $this->assertSame( $key, $message->getKey() ); + $this->assertSame( $params, $message->getParams() ); $this->assertEquals( $expectedLang, $message->getLanguage() ); } @@ -97,7 +97,7 @@ class MessageTest extends MediaWikiLangTestCase { $returned = call_user_func_array( [ $msg, 'params' ], $args ); $this->assertSame( $msg, $returned ); - $this->assertEquals( $expected, $msg->getParams() ); + $this->assertSame( $expected, $msg->getParams() ); } public static function provideConstructorLanguage() { @@ -165,8 +165,8 @@ class MessageTest extends MediaWikiLangTestCase { $msg = new Message( $key ); $this->assertContains( $msg->getKey(), $expected ); - $this->assertEquals( $expected, $msg->getKeysToTry() ); - $this->assertEquals( count( $expected ) > 1, $msg->isMultiKey() ); + $this->assertSame( $expected, $msg->getKeysToTry() ); + $this->assertSame( count( $expected ) > 1, $msg->isMultiKey() ); } /** @@ -190,13 +190,13 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::__construct */ public function testWfMessageParams() { - $this->assertEquals( 'Return to $1.', wfMessage( 'returnto' )->text() ); - $this->assertEquals( 'Return to $1.', wfMessage( 'returnto', [] )->text() ); - $this->assertEquals( + $this->assertSame( 'Return to $1.', wfMessage( 'returnto' )->text() ); + $this->assertSame( 'Return to $1.', wfMessage( 'returnto', [] )->text() ); + $this->assertSame( 'You have foo (bar).', wfMessage( 'youhavenewmessages', 'foo', 'bar' )->text() ); - $this->assertEquals( + $this->assertSame( 'You have foo (bar).', wfMessage( 'youhavenewmessages', [ 'foo', 'bar' ] )->text() ); @@ -222,13 +222,13 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::toString */ public function testToStringKey() { - $this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->text() ); - $this->assertEquals( 'â§¼i-dont-exist-evarâ§½', wfMessage( 'i-dont-exist-evar' )->text() ); - $this->assertEquals( 'â§¼i<dont>exist-evarâ§½', wfMessage( 'iexist-evar' )->text() ); - $this->assertEquals( 'â§¼i-dont-exist-evarâ§½', wfMessage( 'i-dont-exist-evar' )->plain() ); - $this->assertEquals( 'â§¼i<dont>exist-evarâ§½', wfMessage( 'iexist-evar' )->plain() ); - $this->assertEquals( 'â§¼i-dont-exist-evarâ§½', wfMessage( 'i-dont-exist-evar' )->escaped() ); - $this->assertEquals( + $this->assertSame( 'Main Page', wfMessage( 'mainpage' )->text() ); + $this->assertSame( 'â§¼i-dont-exist-evarâ§½', wfMessage( 'i-dont-exist-evar' )->text() ); + $this->assertSame( 'â§¼i<dont>exist-evarâ§½', wfMessage( 'iexist-evar' )->text() ); + $this->assertSame( 'â§¼i-dont-exist-evarâ§½', wfMessage( 'i-dont-exist-evar' )->plain() ); + $this->assertSame( 'â§¼i<dont>exist-evarâ§½', wfMessage( 'iexist-evar' )->plain() ); + $this->assertSame( 'â§¼i-dont-exist-evarâ§½', wfMessage( 'i-dont-exist-evar' )->escaped() ); + $this->assertSame( 'â§¼i<dont>exist-evarâ§½', wfMessage( 'iexist-evar' )->escaped() ); @@ -236,11 +236,14 @@ class MessageTest extends MediaWikiLangTestCase { public static function provideToString() { return [ - [ 'mainpage', 'Main Page' ], - [ 'i-dont-exist-evar', 'â§¼i-dont-exist-evarâ§½' ], - [ 'i-dont-exist-evar', 'â§¼i-dont-exist-evarâ§½', 'escaped' ], - [ 'script>alert(1)alert(1)alert(1)alert(1)$format(); - $this->assertEquals( $expect, $msg->toString() ); - $this->assertEquals( $expect, $msg->__toString() ); + $this->assertSame( $expect, $msg->$format() ); + $this->assertSame( $expect, $msg->toString(), 'toString is unaffected by previous call' ); + $this->assertSame( $expectImplicit, $msg->__toString() ); + $this->assertSame( $expect, $msg->toString(), 'toString is unaffected by __toString' ); + } + + public static function provideToString_raw() { + return [ + [ 'foo', 'parse', 'foo', 'foo' ], + [ 'foo', 'escaped', '<span>foo</span>', + 'foo' ], + [ 'foo', 'plain', 'foo', 'foo' ], + [ '', 'parse', '<script>alert(1)</script>', + '<script>alert(1)</script>' ], + [ '', 'escaped', '<script>alert(1)</script>', + '<script>alert(1)</script>' ], + [ '', 'plain', '', + '<script>alert(1)</script>' ], + ]; + } + + /** + * @covers Message::toString + * @covers Message::__toString + * @dataProvider provideToString_raw + */ + public function testToString_raw( $message, $format, $expect, $expectImplicit ) { + // make the message behave like RawMessage and use the key as-is + $msg = $this->getMockBuilder( Message::class )->setMethods( [ 'fetchMessage' ] ) + ->disableOriginalConstructor() + ->getMock(); + $msg->expects( $this->any() )->method( 'fetchMessage' )->willReturn( $message ); + /** @var Message $msg */ + $this->assertSame( $expect, $msg->$format() ); + $this->assertSame( $expect, $msg->toString(), 'toString is unaffected by previous call' ); + $this->assertSame( $expectImplicit, $msg->__toString() ); + $this->assertSame( $expect, $msg->toString(), 'toString is unaffected by __toString' ); } /** * @covers Message::inLanguage */ public function testInLanguage() { - $this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->inLanguage( 'en' )->text() ); - $this->assertEquals( 'ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°', + $this->assertSame( 'Main Page', wfMessage( 'mainpage' )->inLanguage( 'en' )->text() ); + $this->assertSame( 'ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°', wfMessage( 'mainpage' )->inLanguage( 'ru' )->text() ); // NOTE: make sure internal caching of the message text is reset appropriately $msg = wfMessage( 'mainpage' ); - $this->assertEquals( 'Main Page', $msg->inLanguage( Language::factory( 'en' ) )->text() ); - $this->assertEquals( + $this->assertSame( 'Main Page', $msg->inLanguage( Language::factory( 'en' ) )->text() ); + $this->assertSame( 'ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°', $msg->inLanguage( Language::factory( 'ru' ) )->text() ); @@ -278,19 +315,19 @@ class MessageTest extends MediaWikiLangTestCase { * @covers Message::rawParams */ public function testRawParams() { - $this->assertEquals( + $this->assertSame( '(ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°)', wfMessage( 'parentheses', 'ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°' )->plain() ); - $this->assertEquals( + $this->assertSame( '(ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ° $1)', wfMessage( 'parentheses', 'ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ° $1' )->plain() ); - $this->assertEquals( + $this->assertSame( '(ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°)', wfMessage( 'parentheses' )->rawParams( 'ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°' )->plain() ); - $this->assertEquals( + $this->assertSame( '(ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ° $1)', wfMessage( 'parentheses' )->rawParams( 'ÐÐ°Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ° $1' )->plain() ); @@ -302,8 +339,8 @@ class MessageTest extends MediaWikiLangTestCase { */ public function testRawMessage() { $msg = new RawMessage( 'example &' ); - $this->assertEquals( 'example &', $msg->plain() ); - $this->assertEquals( 'example &', $msg->escaped() ); + $this->assertSame( 'example &', $msg->plain() ); + $this->assertSame( 'example &', $msg->escaped() ); } /** @@ -315,7 +352,7 @@ class MessageTest extends MediaWikiLangTestCase { $msg = new RawMessage( '$1$2$3$4$5$6$7$8$9$10$11$12' ); // One less than above has placeholders $params = [ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k' ]; - $this->assertEquals( + $this->assertSame( 'abcdefghijka2', $msg->params( $params )->plain(), 'Params > 9 are replaced correctly' @@ -323,7 +360,7 @@ class MessageTest extends MediaWikiLangTestCase { $msg = new RawMessage( 'Params$*' ); $params = [ 'ab', 'bc', 'cd' ]; - $this->assertEquals( + $this->assertSame( 'Params: ab, bc, cd', $msg->params( $params )->text() ); @@ -337,7 +374,7 @@ class MessageTest extends MediaWikiLangTestCase { $lang = Language::factory( 'en' ); $msg = new RawMessage( '$1' ); - $this->assertEquals( + $this->assertSame( $lang->formatNum( 123456.789 ), $msg->inLanguage( $lang )->numParams( 123456.789 )->plain(), 'numParams is handled correctly' @@ -352,7 +389,7 @@ class MessageTest extends MediaWikiLangTestCase { $lang = Language::factory( 'en' ); $msg = new RawMessage( '$1' ); - $this->assertEquals( + $this->assertSame( $lang->formatDuration( 1234 ), $msg->inLanguage( $lang )->durationParams( 1234 )->plain(), 'durationParams is handled correctly' @@ -369,7 +406,7 @@ class MessageTest extends MediaWikiLangTestCase { $lang = Language::factory( 'en' ); $msg = new RawMessage( '$1' ); - $this->assertEquals( + $this->assertSame( $lang->formatExpiry( wfTimestampNow() ), $msg->inLanguage( $lang )->expiryParams( wfTimestampNow() )->plain(), 'expiryParams is handled correctly' @@ -384,7 +421,7 @@ class MessageTest extends MediaWikiLangTestCase { $lang = Language::factory( 'en' ); $msg = new RawMessage( '$1' ); - $this->assertEquals( + $this->assertSame( $lang->formatTimePeriod( 1234 ), $msg->inLanguage( $lang )->timeperiodParams( 1234 )->plain(), 'timeperiodParams is handled correctly' @@ -399,7 +436,7 @@ class MessageTest extends MediaWikiLangTestCase { $lang = Language::factory( 'en' ); $msg = new RawMessage( '$1' ); - $this->assertEquals( + $this->assertSame( $lang->formatSize( 123456 ), $msg->inLanguage( $lang )->sizeParams( 123456 )->plain(), 'sizeParams is handled correctly' @@ -414,7 +451,7 @@ class MessageTest extends MediaWikiLangTestCase { $lang = Language::factory( 'en' ); $msg = new RawMessage( '$1' ); - $this->assertEquals( + $this->assertSame( $lang->formatBitrate( 123456 ), $msg->inLanguage( $lang )->bitrateParams( 123456 )->plain(), 'bitrateParams is handled correctly' @@ -468,13 +505,41 @@ class MessageTest extends MediaWikiLangTestCase { 'one $2', '

foo

[[Bar]] {{Baz}} <', ]; - $this->assertEquals( + $this->assertSame( $expect, $msg->inLanguage( $lang )->plaintextParams( $params )->$format(), "Fail formatting for $format" ); } + /** + * @covers Message::extractParam + */ + public function testMessageAsParam() { + $this->setMwGlobals( [ + 'wgScript' => '/wiki/index.php', + 'wgArticlePath' => '/wiki/$1', + ] ); + + $msg = new Message( 'returnto', [ + new Message( 'apihelp-link', [ + 'foo', new Message( 'mainpage', [], Language::factory( 'en' ) ) + ], Language::factory( 'de' ) ) + ], Language::factory( 'es' ) ); + + $this->assertEquals( + 'Volver a [[Special:ApiHelp/foo|PÃ¡gina principal]].', + $msg->text(), + 'Process with ->text()' + ); + $this->assertEquals( + '

Volver a PÃ¡gina ' + . "principal.\n

", + $msg->parseAsBlock(), + 'Process with ->parseAsBlock()' + ); + } + public static function provideParser() { return [ [ @@ -509,7 +574,7 @@ class MessageTest extends MediaWikiLangTestCase { */ public function testParser( $expect, $format ) { $msg = new RawMessage( "''&'' " ); - $this->assertEquals( + $this->assertSame( $expect, $msg->inLanguage( 'en' )->$format() ); @@ -523,9 +588,9 @@ class MessageTest extends MediaWikiLangTestCase { // NOTE: make sure internal caching of the message text is reset appropriately $msg = wfMessage( 'mainpage' ); - $this->assertEquals( 'Hauptseite', $msg->inLanguage( 'de' )->plain(), "inLanguage( 'de' )" ); - $this->assertEquals( 'Main Page', $msg->inContentLanguage()->plain(), "inContentLanguage()" ); - $this->assertEquals( 'Accueil', $msg->inLanguage( 'fr' )->plain(), "inLanguage( 'fr' )" ); + $this->assertSame( 'Hauptseite', $msg->inLanguage( 'de' )->plain(), "inLanguage( 'de' )" ); + $this->assertSame( 'Main Page', $msg->inContentLanguage()->plain(), "inContentLanguage()" ); + $this->assertSame( 'Accueil', $msg->inLanguage( 'fr' )->plain(), "inLanguage( 'fr' )" ); } /** @@ -540,18 +605,18 @@ class MessageTest extends MediaWikiLangTestCase { // NOTE: make sure internal caching of the message text is reset appropriately. // NOTE: wgForceUIMsgAsContentMsg forces the messages *current* language to be used. $msg = wfMessage( 'mainpage' ); - $this->assertEquals( + $this->assertSame( 'Accueil', $msg->inContentLanguage()->plain(), 'inContentLanguage() with ForceUIMsg override enabled' ); - $this->assertEquals( 'Main Page', $msg->inLanguage( 'en' )->plain(), "inLanguage( 'en' )" ); - $this->assertEquals( + $this->assertSame( 'Main Page', $msg->inLanguage( 'en' )->plain(), "inLanguage( 'en' )" ); + $this->assertSame( 'Main Page', $msg->inContentLanguage()->plain(), 'inContentLanguage() with ForceUIMsg override enabled' ); - $this->assertEquals( 'Hauptseite', $msg->inLanguage( 'de' )->plain(), "inLanguage( 'de' )" ); + $this->assertSame( 'Hauptseite', $msg->inLanguage( 'de' )->plain(), "inLanguage( 'de' )" ); } /** @@ -570,18 +635,18 @@ class MessageTest extends MediaWikiLangTestCase { $msg = new Message( 'parentheses' ); $msg->rawParams( 'foo' ); $msg->title( Title::newFromText( 'Testing' ) ); - $this->assertEquals( '(foo)', $msg->parse(), 'Sanity check' ); + $this->assertSame( '(foo)', $msg->parse(), 'Sanity check' ); $msg = unserialize( serialize( $msg ) ); - $this->assertEquals( '(foo)', $msg->parse() ); + $this->assertSame( '(foo)', $msg->parse() ); $title = TestingAccessWrapper::newFromObject( $msg )->title; $this->assertInstanceOf( 'Title', $title ); - $this->assertEquals( 'Testing', $title->getFullText() ); + $this->assertSame( 'Testing', $title->getFullText() ); $msg = new Message( 'mainpage' ); $msg->inLanguage( 'de' ); - $this->assertEquals( 'Hauptseite', $msg->plain(), 'Sanity check' ); + $this->assertSame( 'Hauptseite', $msg->plain(), 'Sanity check' ); $msg = unserialize( serialize( $msg ) ); - $this->assertEquals( 'Hauptseite', $msg->plain() ); + $this->assertSame( 'Hauptseite', $msg->plain() ); } /** @@ -614,4 +679,3 @@ class MessageTest extends MediaWikiLangTestCase { ]; } } - diff --git a/tests/phpunit/includes/MimeMagicTest.php b/tests/phpunit/includes/MimeMagicTest.php deleted file mode 100644 index e00cf0ce30..0000000000 --- a/tests/phpunit/includes/MimeMagicTest.php +++ /dev/null @@ -1,51 +0,0 @@ -mimeMagic = MimeMagic::singleton(); - parent::setUp(); - } - - /** - * @dataProvider providerImproveTypeFromExtension - * @param string $ext File extension (no leading dot) - * @param string $oldMime Initially detected MIME - * @param string $expectedMime MIME type after taking extension into account - */ - function testImproveTypeFromExtension( $ext, $oldMime, $expectedMime ) { - $actualMime = $this->mimeMagic->improveTypeFromExtension( $oldMime, $ext ); - $this->assertEquals( $expectedMime, $actualMime ); - } - - function providerImproveTypeFromExtension() { - return [ - [ 'gif', 'image/gif', 'image/gif' ], - [ 'gif', 'unknown/unknown', 'unknown/unknown' ], - [ 'wrl', 'unknown/unknown', 'model/vrml' ], - [ 'txt', 'text/plain', 'text/plain' ], - [ 'csv', 'text/plain', 'text/csv' ], - [ 'tsv', 'text/plain', 'text/tab-separated-values' ], - [ 'js', 'text/javascript', 'application/javascript' ], - [ 'js', 'application/x-javascript', 'application/javascript' ], - [ 'json', 'text/plain', 'application/json' ], - [ 'foo', 'application/x-opc+zip', 'application/zip' ], - [ 'docx', 'application/x-opc+zip', - 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' ], - [ 'djvu', 'image/x-djvu', 'image/vnd.djvu' ], - [ 'wav', 'audio/wav', 'audio/wav' ], - ]; - } - - /** - * Test to make sure that encoder=ffmpeg2theora doesn't trigger - * MEDIATYPE_VIDEO (bug 63584) - */ - function testOggRecognize() { - $oggFile = __DIR__ . '/../data/media/say-test.ogg'; - $actualType = $this->mimeMagic->getMediaType( $oggFile, 'application/ogg' ); - $this->assertEquals( $actualType, MEDIATYPE_AUDIO ); - } -} diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php index c637d34a5a..626987209d 100644 --- a/tests/phpunit/includes/OutputPageTest.php +++ b/tests/phpunit/includes/OutputPageTest.php @@ -305,6 +305,37 @@ class OutputPageTest extends MediaWikiTestCase { $request->setCookie( 'Token', '123' ); $this->assertTrue( $outputPage->haveCacheVaryCookies() ); } + + /* + * @covers OutputPage::addCategoryLinks + * @covers OutputPage::getCategories + */ + function testGetCategories() { + $fakeResultWrapper = new FakeResultWrapper( [ + (object) [ + 'pp_value' => 1, + 'page_title' => 'Test' + ], + (object) [ + 'page_title' => 'Test2' + ] + ] ); + $outputPage = $this->getMockBuilder( 'OutputPage' ) + ->setConstructorArgs( [ new RequestContext() ] ) + ->setMethods( [ 'addCategoryLinksToLBAndGetResult' ] ) + ->getMock(); + $outputPage->expects( $this->any() ) + ->method( 'addCategoryLinksToLBAndGetResult' ) + ->will( $this->returnValue( $fakeResultWrapper ) ); + + $outputPage->addCategoryLinks( [ + 'Test' => 'Test', + 'Test2' => 'Test2', + ] ); + $this->assertEquals( [ 0 => 'Test', '1' => 'Test2' ], $outputPage->getCategories() ); + $this->assertEquals( [ 0 => 'Test2' ], $outputPage->getCategories( 'normal' ) ); + $this->assertEquals( [ 0 => 'Test' ], $outputPage->getCategories( 'hidden' ) ); + } } /** diff --git a/tests/phpunit/includes/PagePropsTest.php b/tests/phpunit/includes/PagePropsTest.php index cc1708a2b4..29c9e228f2 100644 --- a/tests/phpunit/includes/PagePropsTest.php +++ b/tests/phpunit/includes/PagePropsTest.php @@ -266,11 +266,9 @@ class TestPageProps extends MediaWikiLangTestCase { } protected function setProperties( $pageID, $properties ) { - $rows = []; foreach ( $properties as $propertyName => $propertyValue ) { - $row = [ 'pp_page' => $pageID, 'pp_propname' => $propertyName, @@ -295,11 +293,9 @@ class TestPageProps extends MediaWikiLangTestCase { } protected function setProperty( $pageID, $propertyName, $propertyValue ) { - $properties = []; $properties[$propertyName] = $propertyValue; $this->setProperties( $pageID, $properties ); - } } diff --git a/tests/phpunit/includes/PrefixSearchTest.php b/tests/phpunit/includes/PrefixSearchTest.php index 0ec200c163..bc43709fde 100644 --- a/tests/phpunit/includes/PrefixSearchTest.php +++ b/tests/phpunit/includes/PrefixSearchTest.php @@ -2,8 +2,11 @@ /** * @group Search * @group Database + * @covers PrefixSearch */ class PrefixSearchTest extends MediaWikiLangTestCase { + const NS_NONCAP = 12346; + private $originalHandlers; public function addDBDataOnce() { @@ -31,6 +34,10 @@ class PrefixSearchTest extends MediaWikiLangTestCase { $this->insertPage( 'Talk:Example' ); $this->insertPage( 'User:Example' ); + + $this->insertPage( Title::makeTitle( self::NS_NONCAP, 'Bar' ) ); + $this->insertPage( Title::makeTitle( self::NS_NONCAP, 'Upper' ) ); + $this->insertPage( Title::makeTitle( self::NS_NONCAP, 'sandbox' ) ); } protected function setUp() { @@ -44,11 +51,17 @@ class PrefixSearchTest extends MediaWikiLangTestCase { $this->setMwGlobals( [ 'wgSpecialPages' => [], 'wgHooks' => [], + 'wgExtraNamespaces' => [ self::NS_NONCAP => 'NonCap' ], + 'wgCapitalLinkOverrides' => [ self::NS_NONCAP => false ], ] ); $this->originalHandlers = TestingAccessWrapper::newFromClass( 'Hooks' )->handlers; TestingAccessWrapper::newFromClass( 'Hooks' )->handlers = []; + // Clear caches so that our new namespace appears + MWNamespace::getCanonicalNamespaces( true ); + Language::factory( 'en' )->resetNamespaces(); + SpecialPageFactory::resetList(); } @@ -158,6 +171,29 @@ class PrefixSearchTest extends MediaWikiLangTestCase { 'Special:EditWatchlist/clear', ], ] ], + [ [ + 'Namespace with case sensitive first letter', + 'query' => 'NonCap:upper', + 'results' => [] + ] ], + [ [ + 'Multinamespace search', + 'query' => 'B', + 'results' => [ + 'Bar', + 'NonCap:Bar', + ], + 'namespaces' => [ NS_MAIN, self::NS_NONCAP ], + ] ], + [ [ + 'Multinamespace search with lowercase first letter', + 'query' => 'sand', + 'results' => [ + 'Sandbox', + 'NonCap:sandbox', + ], + 'namespaces' => [ NS_MAIN, self::NS_NONCAP ], + ] ], ]; } @@ -168,8 +204,11 @@ class PrefixSearchTest extends MediaWikiLangTestCase { */ public function testSearch( array $case ) { $this->searchProvision( null ); + + $namespaces = isset( $case['namespaces'] ) ? $case['namespaces'] : []; + $searcher = new StringPrefixSearch; - $results = $searcher->search( $case['query'], 3 ); + $results = $searcher->search( $case['query'], 3, $namespaces ); $this->assertEquals( $case['results'], $results, @@ -184,8 +223,11 @@ class PrefixSearchTest extends MediaWikiLangTestCase { */ public function testSearchWithOffset( array $case ) { $this->searchProvision( null ); + + $namespaces = isset( $case['namespaces'] ) ? $case['namespaces'] : []; + $searcher = new StringPrefixSearch; - $results = $searcher->search( $case['query'], 3, [], 1 ); + $results = $searcher->search( $case['query'], 3, $namespaces, 1 ); // We don't expect the first result when offsetting array_shift( $case['results'] ); diff --git a/tests/phpunit/includes/SampleTest.php b/tests/phpunit/includes/SampleTest.php index 7c313845f9..02935a5369 100644 --- a/tests/phpunit/includes/SampleTest.php +++ b/tests/phpunit/includes/SampleTest.php @@ -32,7 +32,7 @@ class TestSample extends MediaWikiLangTestCase { * they run. While MediaWiki isn't strictly an Agile Programming * project, you are encouraged to use the naming described under * "Agile Documentation" at - * http://www.phpunit.de/manual/3.4/en/other-uses-for-tests.html + * https://www.phpunit.de/manual/3.4/en/other-uses-for-tests.html */ public function testTitleObjectStringConversion() { $title = Title::newFromText( "text" ); @@ -45,7 +45,7 @@ class TestSample extends MediaWikiLangTestCase { /** * If you want to run a the same test with a variety of data, use a data provider. - * see: http://www.phpunit.de/manual/3.4/en/writing-tests-for-phpunit.html + * see: https://www.phpunit.de/manual/3.4/en/writing-tests-for-phpunit.html */ public static function provideTitles() { return [ @@ -60,7 +60,7 @@ class TestSample extends MediaWikiLangTestCase { // @codingStandardsIgnoreStart Generic.Files.LineLength /** * @dataProvider provideTitles - * See http://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.dataProvider + * See https://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.dataProvider */ // @codingStandardsIgnoreEnd public function testCreateBasicListOfTitles( $titleName, $ns, $text ) { @@ -89,7 +89,7 @@ class TestSample extends MediaWikiLangTestCase { /** * @depends testSetUpMainPageTitleForNextTest - * See http://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.depends + * See https://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.depends */ public function testCheckMainPageTitleIsConsideredLocal( $title ) { $this->assertTrue( $title->isLocal() ); @@ -98,7 +98,7 @@ class TestSample extends MediaWikiLangTestCase { // @codingStandardsIgnoreStart Generic.Files.LineLength /** * @expectedException InvalidArgumentException - * See http://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.expectedException + * See https://phpunit.de/manual/3.7/en/appendixes.annotations.html#appendixes.annotations.expectedException */ // @codingStandardsIgnoreEnd public function testTitleObjectFromObject() { diff --git a/tests/phpunit/includes/SanitizerTest.php b/tests/phpunit/includes/SanitizerTest.php index 26529e871c..12db1a198f 100644 --- a/tests/phpunit/includes/SanitizerTest.php +++ b/tests/phpunit/includes/SanitizerTest.php @@ -134,19 +134,19 @@ class SanitizerTest extends MediaWikiTestCase { 'Self-closing closing div' ], // Make sure special nested HTML5 semantics are not broken - // http://www.whatwg.org/html/text-level-semantics.html#the-kbd-element + // https://html.spec.whatwg.org/multipage/semantics.html#the-kbd-element [ 'Shift+F3', 'Shift+F3', 'Nested .' ], - // http://www.whatwg.org/html/text-level-semantics.html#the-sub-and-sup-elements + // https://html.spec.whatwg.org/multipage/semantics.html#the-sub-and-sup-elements [ 'x_i, y_i', 'x_i, y_i', 'Nested .' ], - // http://www.whatwg.org/html/text-level-semantics.html#the-dfn-element + // https://html.spec.whatwg.org/multipage/semantics.html#the-dfn-element [ 'GDO', 'GDO', @@ -314,6 +314,8 @@ class SanitizerTest extends MediaWikiTestCase { '/* insecure input */', 'background-image: -moz-image-set("asdf.png" 1x, "asdf.png" 2x);' ], + [ '/* insecure input */', 'foo: attr( title, url );' ], + [ '/* insecure input */', 'foo: attr( title url );' ], ]; } diff --git a/tests/phpunit/includes/StatusTest.php b/tests/phpunit/includes/StatusTest.php index 474a481a6e..7e56ebf20b 100644 --- a/tests/phpunit/includes/StatusTest.php +++ b/tests/phpunit/includes/StatusTest.php @@ -57,9 +57,11 @@ class StatusTest extends MediaWikiLangTestCase { } /** + * Test 'ok' and 'errors' getters. * + * @covers Status::__get */ - public function testOkAndErrors() { + public function testOkAndErrorsGetters() { $status = Status::newGood( 'foo' ); $this->assertTrue( $status->ok ); $status = Status::newFatal( 'foo', 1, 2 ); @@ -76,6 +78,19 @@ class StatusTest extends MediaWikiLangTestCase { ); } + /** + * Test 'ok' setter. + * + * @covers Status::__set + */ + public function testOkSetter() { + $status = new Status(); + $status->ok = false; + $this->assertFalse( $status->isOK() ); + $status->ok = true; + $this->assertTrue( $status->isOK() ); + } + /** * @dataProvider provideSetResult * @covers Status::setResult @@ -98,11 +113,12 @@ class StatusTest extends MediaWikiLangTestCase { /** * @dataProvider provideIsOk - * @covers Status::isOk + * @covers Status::setOK + * @covers Status::isOK */ public function testIsOk( $ok ) { $status = new Status(); - $status->ok = $ok; + $status->setOK( $ok ); $this->assertEquals( $ok, $status->isOK() ); } @@ -128,7 +144,7 @@ class StatusTest extends MediaWikiLangTestCase { */ public function testIsGood( $ok, $errors, $expected ) { $status = new Status(); - $status->ok = $ok; + $status->setOK( $ok ); foreach ( $errors as $error ) { $status->warning( $error ); } @@ -171,6 +187,7 @@ class StatusTest extends MediaWikiLangTestCase { * @covers Status::error * @covers Status::getErrorsArray * @covers Status::getStatusArray + * @covers Status::getErrors */ public function testErrorWithMessage( $mockDetails ) { $status = new Status(); @@ -361,7 +378,7 @@ class StatusTest extends MediaWikiLangTestCase { ]; $status = new Status(); - $status->ok = false; + $status->setOK( false ); $testCases['GoodButNoError'] = [ $status, "Internal error: Status::getWikiText: Invalid result object: no error text but not OK\n", @@ -475,7 +492,7 @@ class StatusTest extends MediaWikiLangTestCase { ]; $status = new Status(); - $status->ok = false; + $status->setOK( false ); $testCases['GoodButNoError'] = [ $status, [ "Status::getMessage: Invalid result object: no error text but not OK\n" ], @@ -645,4 +662,66 @@ class StatusTest extends MediaWikiLangTestCase { ]; } + /** + * @dataProvider provideErrorsWarningsOnly + * @covers Status::splitByErrorType + * @covers StatusValue::splitByErrorType + */ + public function testGetErrorsWarningsOnlyStatus( $errorText, $warningText, $type, $errorResult, + $warningResult + ) { + $status = Status::newGood(); + if ( $errorText ) { + $status->fatal( $errorText ); + } + if ( $warningText ) { + $status->warning( $warningText ); + } + $testStatus = $status->splitByErrorType()[$type]; + $this->assertEquals( $errorResult, $testStatus->getErrorsByType( 'error' ) ); + $this->assertEquals( $warningResult, $testStatus->getErrorsByType( 'warning' ) ); + } + + public static function provideErrorsWarningsOnly() { + return [ + [ + 'Just an error', + 'Just a warning', + 0, + [ + 0 => [ + 'type' => 'error', + 'message' => 'Just an error', + 'params' => [] + ], + ], + [], + ], [ + 'Just an error', + 'Just a warning', + 1, + [], + [ + 0 => [ + 'type' => 'warning', + 'message' => 'Just a warning', + 'params' => [] + ], + ], + ], [ + null, + null, + 1, + [], + [], + ], [ + null, + null, + 0, + [], + [], + ] + ]; + } + } diff --git a/tests/phpunit/includes/TemplateCategoriesTest.php b/tests/phpunit/includes/TemplateCategoriesTest.php index 9359568375..152602ac5e 100644 --- a/tests/phpunit/includes/TemplateCategoriesTest.php +++ b/tests/phpunit/includes/TemplateCategoriesTest.php @@ -91,6 +91,5 @@ class TemplateCategoriesTest extends MediaWikiLangTestCase { $title->getParentCategories(), 'Verify that the page is no longer in the category after template deletion' ); - } } diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php index 7850f2490c..7925c6f8f9 100644 --- a/tests/phpunit/includes/TitleTest.php +++ b/tests/phpunit/includes/TitleTest.php @@ -90,6 +90,8 @@ class TitleTest extends MediaWikiTestCase { [ 'A < B', 'title-invalid-characters' ], [ 'A > B', 'title-invalid-characters' ], [ 'A | B', 'title-invalid-characters' ], + [ "A \t B", 'title-invalid-characters' ], + [ "A \n B", 'title-invalid-characters' ], // URL encoding [ 'A%20B', 'title-invalid-characters' ], [ 'A%23B', 'title-invalid-characters' ], diff --git a/tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php b/tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php index 1d232fee8e..93687df2d5 100644 --- a/tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php +++ b/tests/phpunit/includes/WatchedItemQueryServiceUnitTest.php @@ -6,10 +6,10 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { /** - * @return PHPUnit_Framework_MockObject_MockObject|DatabaseBase + * @return PHPUnit_Framework_MockObject_MockObject|Database */ private function getMockDb() { - $mock = $this->getMockBuilder( DatabaseBase::class ) + $mock = $this->getMockBuilder( Database::class ) ->disableOriginalConstructor() ->getMock(); @@ -55,7 +55,7 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { ->disableOriginalConstructor() ->getMock(); $mock->expects( $this->any() ) - ->method( 'getConnection' ) + ->method( 'getConnectionRef' ) ->with( DB_SLAVE ) ->will( $this->returnValue( $mockDb ) ); return $mock; @@ -180,7 +180,9 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { '(rc_this_oldid=page_latest) OR (rc_type=3)', ], $this->isType( 'string' ), - [], + [ + 'LIMIT' => 3, + ], [ 'watchlist' => [ 'INNER JOIN', @@ -214,12 +216,184 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { 'rc_deleted' => 0, 'wl_notificationtimestamp' => null, ] ), + $this->getFakeRow( [ + 'rc_id' => 3, + 'rc_namespace' => 1, + 'rc_title' => 'Foo3', + 'rc_timestamp' => '20151212010103', + 'rc_type' => RC_NEW, + 'rc_deleted' => 0, + 'wl_notificationtimestamp' => null, + ] ), ] ) ); $queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) ); $user = $this->getMockUnrestrictedNonAnonUserWithId( 1 ); - $items = $queryService->getWatchedItemsWithRecentChangeInfo( $user ); + $startFrom = null; + $items = $queryService->getWatchedItemsWithRecentChangeInfo( + $user, [ 'limit' => 2 ], $startFrom + ); + + $this->assertInternalType( 'array', $items ); + $this->assertCount( 2, $items ); + + foreach ( $items as list( $watchedItem, $recentChangeInfo ) ) { + $this->assertInstanceOf( WatchedItem::class, $watchedItem ); + $this->assertInternalType( 'array', $recentChangeInfo ); + } + + $this->assertEquals( + new WatchedItem( $user, new TitleValue( 0, 'Foo1' ), '20151212010101' ), + $items[0][0] + ); + $this->assertEquals( + [ + 'rc_id' => 1, + 'rc_namespace' => 0, + 'rc_title' => 'Foo1', + 'rc_timestamp' => '20151212010101', + 'rc_type' => RC_NEW, + 'rc_deleted' => 0, + ], + $items[0][1] + ); + + $this->assertEquals( + new WatchedItem( $user, new TitleValue( 1, 'Foo2' ), null ), + $items[1][0] + ); + $this->assertEquals( + [ + 'rc_id' => 2, + 'rc_namespace' => 1, + 'rc_title' => 'Foo2', + 'rc_timestamp' => '20151212010102', + 'rc_type' => RC_NEW, + 'rc_deleted' => 0, + ], + $items[1][1] + ); + + $this->assertEquals( [ '20151212010103', 3 ], $startFrom ); + } + + public function testGetWatchedItemsWithRecentChangeInfo_extension() { + $mockDb = $this->getMockDb(); + $mockDb->expects( $this->once() ) + ->method( 'select' ) + ->with( + [ 'recentchanges', 'watchlist', 'page', 'extension_dummy_table' ], + [ + 'rc_id', + 'rc_namespace', + 'rc_title', + 'rc_timestamp', + 'rc_type', + 'rc_deleted', + 'wl_notificationtimestamp', + 'rc_cur_id', + 'rc_this_oldid', + 'rc_last_oldid', + 'extension_dummy_field', + ], + [ + 'wl_user' => 1, + '(rc_this_oldid=page_latest) OR (rc_type=3)', + 'extension_dummy_cond', + ], + $this->isType( 'string' ), + [ + 'extension_dummy_option', + ], + [ + 'watchlist' => [ + 'INNER JOIN', + [ + 'wl_namespace=rc_namespace', + 'wl_title=rc_title' + ] + ], + 'page' => [ + 'LEFT JOIN', + 'rc_cur_id=page_id', + ], + 'extension_dummy_join_cond' => [], + ] + ) + ->will( $this->returnValue( [ + $this->getFakeRow( [ + 'rc_id' => 1, + 'rc_namespace' => 0, + 'rc_title' => 'Foo1', + 'rc_timestamp' => '20151212010101', + 'rc_type' => RC_NEW, + 'rc_deleted' => 0, + 'wl_notificationtimestamp' => '20151212010101', + ] ), + $this->getFakeRow( [ + 'rc_id' => 2, + 'rc_namespace' => 1, + 'rc_title' => 'Foo2', + 'rc_timestamp' => '20151212010102', + 'rc_type' => RC_NEW, + 'rc_deleted' => 0, + 'wl_notificationtimestamp' => null, + ] ), + ] ) ); + + $user = $this->getMockUnrestrictedNonAnonUserWithId( 1 ); + + $mockExtension = $this->getMockBuilder( WatchedItemQueryServiceExtension::class ) + ->getMock(); + $mockExtension->expects( $this->once() ) + ->method( 'modifyWatchedItemsWithRCInfoQuery' ) + ->with( + $this->identicalTo( $user ), + $this->isType( 'array' ), + $this->isInstanceOf( IDatabase::class ), + $this->isType( 'array' ), + $this->isType( 'array' ), + $this->isType( 'array' ), + $this->isType( 'array' ), + $this->isType( 'array' ) + ) + ->will( $this->returnCallback( function ( + $user, $options, $db, &$tables, &$fields, &$conds, &$dbOptions, &$joinConds + ) { + $tables[] = 'extension_dummy_table'; + $fields[] = 'extension_dummy_field'; + $conds[] = 'extension_dummy_cond'; + $dbOptions[] = 'extension_dummy_option'; + $joinConds['extension_dummy_join_cond'] = []; + } ) ); + $mockExtension->expects( $this->once() ) + ->method( 'modifyWatchedItemsWithRCInfo' ) + ->with( + $this->identicalTo( $user ), + $this->isType( 'array' ), + $this->isInstanceOf( IDatabase::class ), + $this->isType( 'array' ), + $this->anything(), + $this->anything() // Can't test for null here, PHPUnit applies this after the callback + ) + ->will( $this->returnCallback( function ( $user, $options, $db, &$items, $res, &$startFrom ) { + foreach ( $items as $i => &$item ) { + $item[1]['extension_dummy_field'] = $i; + } + unset( $item ); + + $this->assertNull( $startFrom ); + $startFrom = [ '20160203123456', 42 ]; + } ) ); + + $queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) ); + TestingAccessWrapper::newFromObject( $queryService )->extensions = [ $mockExtension ]; + + $startFrom = null; + $items = $queryService->getWatchedItemsWithRecentChangeInfo( + $user, [], $startFrom + ); $this->assertInternalType( 'array', $items ); $this->assertCount( 2, $items ); @@ -241,6 +415,7 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { 'rc_timestamp' => '20151212010101', 'rc_type' => RC_NEW, 'rc_deleted' => 0, + 'extension_dummy_field' => 0, ], $items[0][1] ); @@ -257,93 +432,110 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { 'rc_timestamp' => '20151212010102', 'rc_type' => RC_NEW, 'rc_deleted' => 0, + 'extension_dummy_field' => 1, ], $items[1][1] ); + + $this->assertEquals( [ '20160203123456', 42 ], $startFrom ); } public function getWatchedItemsWithRecentChangeInfoOptionsProvider() { return [ [ [ 'includeFields' => [ WatchedItemQueryService::INCLUDE_FLAGS ] ], + null, [ 'rc_type', 'rc_minor', 'rc_bot' ], [], [], ], [ [ 'includeFields' => [ WatchedItemQueryService::INCLUDE_USER ] ], + null, [ 'rc_user_text' ], [], [], ], [ [ 'includeFields' => [ WatchedItemQueryService::INCLUDE_USER_ID ] ], + null, [ 'rc_user' ], [], [], ], [ [ 'includeFields' => [ WatchedItemQueryService::INCLUDE_COMMENT ] ], + null, [ 'rc_comment' ], [], [], ], [ [ 'includeFields' => [ WatchedItemQueryService::INCLUDE_PATROL_INFO ] ], + null, [ 'rc_patrolled', 'rc_log_type' ], [], [], ], [ [ 'includeFields' => [ WatchedItemQueryService::INCLUDE_SIZES ] ], + null, [ 'rc_old_len', 'rc_new_len' ], [], [], ], [ [ 'includeFields' => [ WatchedItemQueryService::INCLUDE_LOG_INFO ] ], + null, [ 'rc_logid', 'rc_log_type', 'rc_log_action', 'rc_params' ], [], [], ], [ [ 'namespaceIds' => [ 0, 1 ] ], + null, [], [ 'wl_namespace' => [ 0, 1 ] ], [], ], [ [ 'namespaceIds' => [ 0, "1; DROP TABLE watchlist;\n--" ] ], + null, [], [ 'wl_namespace' => [ 0, 1 ] ], [], ], [ [ 'rcTypes' => [ RC_EDIT, RC_NEW ] ], + null, [], [ 'rc_type' => [ RC_EDIT, RC_NEW ] ], [], ], [ [ 'dir' => WatchedItemQueryService::DIR_OLDER ], + null, [], [], [ 'ORDER BY' => [ 'rc_timestamp DESC', 'rc_id DESC' ] ] ], [ [ 'dir' => WatchedItemQueryService::DIR_NEWER ], + null, [], [], [ 'ORDER BY' => [ 'rc_timestamp', 'rc_id' ] ] ], [ [ 'dir' => WatchedItemQueryService::DIR_OLDER, 'start' => '20151212010101' ], + null, [], [ "rc_timestamp <= '20151212010101'" ], [ 'ORDER BY' => [ 'rc_timestamp DESC', 'rc_id DESC' ] ] ], [ [ 'dir' => WatchedItemQueryService::DIR_OLDER, 'end' => '20151212010101' ], + null, [], [ "rc_timestamp >= '20151212010101'" ], [ 'ORDER BY' => [ 'rc_timestamp DESC', 'rc_id DESC' ] ] @@ -354,18 +546,21 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { 'start' => '20151212020101', 'end' => '20151212010101' ], + null, [], [ "rc_timestamp <= '20151212020101'", "rc_timestamp >= '20151212010101'" ], [ 'ORDER BY' => [ 'rc_timestamp DESC', 'rc_id DESC' ] ] ], [ [ 'dir' => WatchedItemQueryService::DIR_NEWER, 'start' => '20151212010101' ], + null, [], [ "rc_timestamp >= '20151212010101'" ], [ 'ORDER BY' => [ 'rc_timestamp', 'rc_id' ] ] ], [ [ 'dir' => WatchedItemQueryService::DIR_NEWER, 'end' => '20151212010101' ], + null, [], [ "rc_timestamp <= '20151212010101'" ], [ 'ORDER BY' => [ 'rc_timestamp', 'rc_id' ] ] @@ -376,96 +571,112 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { 'start' => '20151212010101', 'end' => '20151212020101' ], + null, [], [ "rc_timestamp >= '20151212010101'", "rc_timestamp <= '20151212020101'" ], [ 'ORDER BY' => [ 'rc_timestamp', 'rc_id' ] ] ], [ [ 'limit' => 10 ], + null, [], [], - [ 'LIMIT' => 10 ], + [ 'LIMIT' => 11 ], ], [ [ 'limit' => "10; DROP TABLE watchlist;\n--" ], + null, [], [], - [ 'LIMIT' => 10 ], + [ 'LIMIT' => 11 ], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_MINOR ] ], + null, [], [ 'rc_minor != 0' ], [], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_NOT_MINOR ] ], + null, [], [ 'rc_minor = 0' ], [], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_BOT ] ], + null, [], [ 'rc_bot != 0' ], [], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_NOT_BOT ] ], + null, [], [ 'rc_bot = 0' ], [], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_ANON ] ], + null, [], [ 'rc_user = 0' ], [], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_NOT_ANON ] ], + null, [], [ 'rc_user != 0' ], [], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_PATROLLED ] ], + null, [], [ 'rc_patrolled != 0' ], [], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_NOT_PATROLLED ] ], + null, [], [ 'rc_patrolled = 0' ], [], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_UNREAD ] ], + null, [], [ 'rc_timestamp >= wl_notificationtimestamp' ], [], ], [ [ 'filters' => [ WatchedItemQueryService::FILTER_NOT_UNREAD ] ], + null, [], [ 'wl_notificationtimestamp IS NULL OR rc_timestamp < wl_notificationtimestamp' ], [], ], [ [ 'onlyByUser' => 'SomeOtherUser' ], + null, [], [ 'rc_user_text' => 'SomeOtherUser' ], [], ], [ [ 'notByUser' => 'SomeOtherUser' ], + null, [], [ "rc_user_text != 'SomeOtherUser'" ], [], ], [ - [ 'startFrom' => [ '20151212010101', 123 ], 'dir' => WatchedItemQueryService::DIR_OLDER ], + [ 'dir' => WatchedItemQueryService::DIR_OLDER ], + [ '20151212010101', 123 ], [], [ "(rc_timestamp < '20151212010101') OR ((rc_timestamp = '20151212010101') AND (rc_id <= 123))" @@ -473,7 +684,8 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { [ 'ORDER BY' => [ 'rc_timestamp DESC', 'rc_id DESC' ] ], ], [ - [ 'startFrom' => [ '20151212010101', 123 ], 'dir' => WatchedItemQueryService::DIR_NEWER ], + [ 'dir' => WatchedItemQueryService::DIR_NEWER ], + [ '20151212010101', 123 ], [], [ "(rc_timestamp > '20151212010101') OR ((rc_timestamp = '20151212010101') AND (rc_id >= 123))" @@ -481,10 +693,8 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { [ 'ORDER BY' => [ 'rc_timestamp', 'rc_id' ] ], ], [ - [ - 'startFrom' => [ '20151212010101', "123; DROP TABLE watchlist;\n--" ], - 'dir' => WatchedItemQueryService::DIR_OLDER - ], + [ 'dir' => WatchedItemQueryService::DIR_OLDER ], + [ '20151212010101', "123; DROP TABLE watchlist;\n--" ], [], [ "(rc_timestamp < '20151212010101') OR ((rc_timestamp = '20151212010101') AND (rc_id <= 123))" @@ -499,6 +709,7 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { */ public function testGetWatchedItemsWithRecentChangeInfo_optionsAndEmptyResult( array $options, + $startFrom, array $expectedExtraFields, array $expectedExtraConds, array $expectedDbOptions @@ -552,9 +763,10 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { $queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) ); $user = $this->getMockUnrestrictedNonAnonUserWithId( 1 ); - $items = $queryService->getWatchedItemsWithRecentChangeInfo( $user, $options ); + $items = $queryService->getWatchedItemsWithRecentChangeInfo( $user, $options, $startFrom ); $this->assertEmpty( $items ); + $this->assertNull( $startFrom ); } public function filterPatrolledOptionProvider() { @@ -797,53 +1009,62 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { return [ [ [ 'rcTypes' => [ 1337 ] ], + null, 'Bad value for parameter $options[\'rcTypes\']', ], [ [ 'rcTypes' => [ 'edit' ] ], + null, 'Bad value for parameter $options[\'rcTypes\']', ], [ [ 'rcTypes' => [ RC_EDIT, 1337 ] ], + null, 'Bad value for parameter $options[\'rcTypes\']', ], [ [ 'dir' => 'foo' ], + null, 'Bad value for parameter $options[\'dir\']', ], [ [ 'start' => '20151212010101' ], + null, 'Bad value for parameter $options[\'dir\']: must be provided', ], [ [ 'end' => '20151212010101' ], + null, 'Bad value for parameter $options[\'dir\']: must be provided', ], [ - [ 'startFrom' => [ '20151212010101', 123 ] ], + [], + [ '20151212010101', 123 ], 'Bad value for parameter $options[\'dir\']: must be provided', ], [ - [ 'dir' => WatchedItemQueryService::DIR_OLDER, 'startFrom' => '20151212010101' ], - 'Bad value for parameter $options[\'startFrom\']: must be a two-element array', + [ 'dir' => WatchedItemQueryService::DIR_OLDER ], + '20151212010101', + 'Bad value for parameter $startFrom: must be a two-element array', ], [ - [ 'dir' => WatchedItemQueryService::DIR_OLDER, 'startFrom' => [ '20151212010101' ] ], - 'Bad value for parameter $options[\'startFrom\']: must be a two-element array', + [ 'dir' => WatchedItemQueryService::DIR_OLDER ], + [ '20151212010101' ], + 'Bad value for parameter $startFrom: must be a two-element array', ], [ - [ - 'dir' => WatchedItemQueryService::DIR_OLDER, - 'startFrom' => [ '20151212010101', 123, 'foo' ] - ], - 'Bad value for parameter $options[\'startFrom\']: must be a two-element array', + [ 'dir' => WatchedItemQueryService::DIR_OLDER ], + [ '20151212010101', 123, 'foo' ], + 'Bad value for parameter $startFrom: must be a two-element array', ], [ [ 'watchlistOwner' => $this->getMockUnrestrictedNonAnonUserWithId( 2 ) ], + null, 'Bad value for parameter $options[\'watchlistOwnerToken\']', ], [ [ 'watchlistOwner' => 'Other User', 'watchlistOwnerToken' => 'some-token' ], + null, 'Bad value for parameter $options[\'watchlistOwner\']', ], ]; @@ -854,6 +1075,7 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { */ public function testGetWatchedItemsWithRecentChangeInfo_invalidOptions( array $options, + $startFrom, $expectedInExceptionMessage ) { $mockDb = $this->getMockDb(); @@ -864,7 +1086,7 @@ class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase { $user = $this->getMockUnrestrictedNonAnonUserWithId( 1 ); $this->setExpectedException( InvalidArgumentException::class, $expectedInExceptionMessage ); - $queryService->getWatchedItemsWithRecentChangeInfo( $user, $options ); + $queryService->getWatchedItemsWithRecentChangeInfo( $user, $options, $startFrom ); } public function testGetWatchedItemsWithRecentChangeInfo_usedInGeneratorOptionAndEmptyResult() { diff --git a/tests/phpunit/includes/WatchedItemStoreUnitTest.php b/tests/phpunit/includes/WatchedItemStoreUnitTest.php index 030d9d59db..ba4705970c 100644 --- a/tests/phpunit/includes/WatchedItemStoreUnitTest.php +++ b/tests/phpunit/includes/WatchedItemStoreUnitTest.php @@ -1,5 +1,6 @@ getMock(); if ( $expectedConnectionType !== null ) { $mock->expects( $this->any() ) - ->method( 'getConnection' ) + ->method( 'getConnectionRef' ) ->with( $expectedConnectionType ) ->will( $this->returnValue( $mockDb ) ); } else { $mock->expects( $this->any() ) - ->method( 'getConnection' ) + ->method( 'getConnectionRef' ) ->will( $this->returnValue( $mockDb ) ); } $mock->expects( $this->any() ) diff --git a/tests/phpunit/includes/WebRequestTest.php b/tests/phpunit/includes/WebRequestTest.php index c946689353..041e7e3cd6 100644 --- a/tests/phpunit/includes/WebRequestTest.php +++ b/tests/phpunit/includes/WebRequestTest.php @@ -10,12 +10,10 @@ class WebRequestTest extends MediaWikiTestCase { parent::setUp(); $this->oldServer = $_SERVER; - IP::clearCaches(); } protected function tearDown() { $_SERVER = $this->oldServer; - IP::clearCaches(); parent::tearDown(); } @@ -23,8 +21,11 @@ class WebRequestTest extends MediaWikiTestCase { /** * @dataProvider provideDetectServer * @covers WebRequest::detectServer + * @covers WebRequest::detectProtocol */ public function testDetectServer( $expected, $input, $description ) { + $this->setMwGlobals( 'wgAssumeProxiesUseDefaultProtocolPorts', true ); + $_SERVER = $input; $result = WebRequest::detectServer(); $this->assertEquals( $expected, $result, $description ); @@ -63,6 +64,24 @@ class WebRequestTest extends MediaWikiTestCase { ], 'Secure off' ], + [ + 'https://x', + [ + 'HTTP_HOST' => 'x', + 'HTTP_X_FORWARDED_PROTO' => 'https', + ], + 'Forwarded HTTPS' + ], + [ + 'https://x', + [ + 'HTTP_HOST' => 'x', + 'HTTPS' => 'off', + 'SERVER_PORT' => '81', + 'HTTP_X_FORWARDED_PROTO' => 'https', + ], + 'Forwarded HTTPS' + ], [ 'http://y', [ @@ -104,6 +123,241 @@ class WebRequestTest extends MediaWikiTestCase { ]; } + protected function mockWebRequest( $data = [] ) { + // Cannot use PHPUnit getMockBuilder() as it does not support + // overriding protected properties afterwards + $reflection = new ReflectionClass( 'WebRequest' ); + $req = $reflection->newInstanceWithoutConstructor(); + + $prop = $reflection->getProperty( 'data' ); + $prop->setAccessible( true ); + $prop->setValue( $req, $data ); + + $prop = $reflection->getProperty( 'requestTime' ); + $prop->setAccessible( true ); + $prop->setValue( $req, microtime( true ) ); + + return $req; + } + + /** + * @covers WebRequest::getElapsedTime + */ + public function testGetElapsedTime() { + $req = $this->mockWebRequest(); + $this->assertGreaterThanOrEqual( 0.0, $req->getElapsedTime() ); + $this->assertEquals( 0.0, $req->getElapsedTime(), '', /*delta*/ 0.2 ); + } + + /** + * @covers WebRequest::getVal + * @covers WebRequest::getGPCVal + * @covers WebRequest::normalizeUnicode + */ + public function testGetValNormal() { + // Assert that WebRequest normalises GPC data using UtfNormal\Validator + $input = "a \x00 null"; + $normal = "a \xef\xbf\xbd null"; + $req = $this->mockWebRequest( [ 'x' => $input, 'y' => [ $input, $input ] ] ); + $this->assertSame( $normal, $req->getVal( 'x' ) ); + $this->assertNotSame( $input, $req->getVal( 'x' ) ); + $this->assertSame( [ $normal, $normal ], $req->getArray( 'y' ) ); + } + + /** + * @covers WebRequest::getVal + * @covers WebRequest::getGPCVal + */ + public function testGetVal() { + $req = $this->mockWebRequest( [ 'x' => 'Value', 'y' => [ 'a' ], 'crlf' => "A\r\nb" ] ); + $this->assertSame( 'Value', $req->getVal( 'x' ), 'Simple value' ); + $this->assertSame( null, $req->getVal( 'z' ), 'Not found' ); + $this->assertSame( null, $req->getVal( 'y' ), 'Array is ignored' ); + $this->assertSame( "A\r\nb", $req->getVal( 'crlf' ), 'CRLF' ); + } + + /** + * @covers WebRequest::getRawVal + */ + public function testGetRawVal() { + $req = $this->mockWebRequest( [ + 'x' => 'Value', + 'y' => [ 'a' ], + 'crlf' => "A\r\nb" + ] ); + $this->assertSame( 'Value', $req->getRawVal( 'x' ) ); + $this->assertSame( null, $req->getRawVal( 'z' ), 'Not found' ); + $this->assertSame( null, $req->getRawVal( 'y' ), 'Array is ignored' ); + $this->assertSame( "A\r\nb", $req->getRawVal( 'crlf' ), 'CRLF' ); + } + + /** + * @covers WebRequest::getArray + */ + public function testGetArray() { + $req = $this->mockWebRequest( [ 'x' => 'Value', 'y' => [ 'a', 'b' ] ] ); + $this->assertSame( [ 'Value' ], $req->getArray( 'x' ), 'Value becomes array' ); + $this->assertSame( null, $req->getArray( 'z' ), 'Not found' ); + $this->assertSame( [ 'a', 'b' ], $req->getArray( 'y' ) ); + } + + /** + * @covers WebRequest::getIntArray + */ + public function testGetIntArray() { + $req = $this->mockWebRequest( [ 'x' => [ 'Value' ], 'y' => [ '0', '4.2', '-2' ] ] ); + $this->assertSame( [ 0 ], $req->getIntArray( 'x' ), 'Text becomes 0' ); + $this->assertSame( null, $req->getIntArray( 'z' ), 'Not found' ); + $this->assertSame( [ 0, 4, -2 ], $req->getIntArray( 'y' ) ); + } + + /** + * @covers WebRequest::getInt + */ + public function testGetInt() { + $req = $this->mockWebRequest( [ + 'x' => 'Value', + 'y' => [ 'a' ], + 'zero' => '0', + 'answer' => '4.2', + 'neg' => '-2', + ] ); + $this->assertSame( 0, $req->getInt( 'x' ), 'Text' ); + $this->assertSame( 0, $req->getInt( 'y' ), 'Array' ); + $this->assertSame( 0, $req->getInt( 'z' ), 'Not found' ); + $this->assertSame( 0, $req->getInt( 'zero' ) ); + $this->assertSame( 4, $req->getInt( 'answer' ) ); + $this->assertSame( -2, $req->getInt( 'neg' ) ); + } + + /** + * @covers WebRequest::getIntOrNull + */ + public function testGetIntOrNull() { + $req = $this->mockWebRequest( [ + 'x' => 'Value', + 'y' => [ 'a' ], + 'zero' => '0', + 'answer' => '4.2', + 'neg' => '-2', + ] ); + $this->assertSame( null, $req->getIntOrNull( 'x' ), 'Text' ); + $this->assertSame( null, $req->getIntOrNull( 'y' ), 'Array' ); + $this->assertSame( null, $req->getIntOrNull( 'z' ), 'Not found' ); + $this->assertSame( 0, $req->getIntOrNull( 'zero' ) ); + $this->assertSame( 4, $req->getIntOrNull( 'answer' ) ); + $this->assertSame( -2, $req->getIntOrNull( 'neg' ) ); + } + + /** + * @covers WebRequest::getFloat + */ + public function testGetFloat() { + $req = $this->mockWebRequest( [ + 'x' => 'Value', + 'y' => [ 'a' ], + 'zero' => '0', + 'answer' => '4.2', + 'neg' => '-2', + ] ); + $this->assertSame( 0.0, $req->getFloat( 'x' ), 'Text' ); + $this->assertSame( 0.0, $req->getFloat( 'y' ), 'Array' ); + $this->assertSame( 0.0, $req->getFloat( 'z' ), 'Not found' ); + $this->assertSame( 0.0, $req->getFloat( 'zero' ) ); + $this->assertSame( 4.2, $req->getFloat( 'answer' ) ); + $this->assertSame( -2.0, $req->getFloat( 'neg' ) ); + } + + /** + * @covers WebRequest::getBool + */ + public function testGetBool() { + $req = $this->mockWebRequest( [ + 'x' => 'Value', + 'y' => [ 'a' ], + 'zero' => '0', + 'f' => 'false', + 't' => 'true', + ] ); + $this->assertSame( true, $req->getBool( 'x' ), 'Text' ); + $this->assertSame( false, $req->getBool( 'y' ), 'Array' ); + $this->assertSame( false, $req->getBool( 'z' ), 'Not found' ); + $this->assertSame( false, $req->getBool( 'zero' ) ); + $this->assertSame( true, $req->getBool( 'f' ) ); + $this->assertSame( true, $req->getBool( 't' ) ); + } + + public static function provideFuzzyBool() { + return [ + [ 'Text', true ], + [ '', false, '(empty string)' ], + [ '0', false ], + [ '1', true ], + [ 'false', false ], + [ 'true', true ], + [ 'False', false ], + [ 'True', true ], + [ 'FALSE', false ], + [ 'TRUE', true ], + ]; + } + + /** + * @dataProvider provideFuzzyBool + * @covers WebRequest::getFuzzyBool + */ + public function testGetFuzzyBool( $value, $expected, $message = null ) { + $req = $this->mockWebRequest( [ 'x' => $value ] ); + $this->assertSame( $expected, $req->getFuzzyBool( 'x' ), $message ?: "Value: '$value'" ); + } + + /** + * @covers WebRequest::getFuzzyBool + */ + public function testGetFuzzyBoolDefault() { + $req = $this->mockWebRequest(); + $this->assertSame( false, $req->getFuzzyBool( 'z' ), 'Not found' ); + } + + /** + * @covers WebRequest::getCheck + */ + public function testGetCheck() { + $req = $this->mockWebRequest( [ 'x' => 'Value', 'zero' => '0' ] ); + $this->assertSame( false, $req->getCheck( 'z' ), 'Not found' ); + $this->assertSame( true, $req->getCheck( 'x' ), 'Text' ); + $this->assertSame( true, $req->getCheck( 'zero' ) ); + } + + /** + * @covers WebRequest::getText + */ + public function testGetText() { + // Avoid FauxRequest (overrides getText) + $req = $this->mockWebRequest( [ 'crlf' => "Va\r\nlue" ] ); + $this->assertSame( "Va\nlue", $req->getText( 'crlf' ), 'CR stripped' ); + } + + /** + * @covers WebRequest::getValues + */ + public function testGetValues() { + $values = [ 'x' => 'Value', 'y' => '' ]; + // Avoid FauxRequest (overrides getValues) + $req = $this->mockWebRequest( $values ); + $this->assertSame( $values, $req->getValues() ); + $this->assertSame( [ 'x' => 'Value' ], $req->getValues( 'x' ), 'Specific keys' ); + } + + /** + * @covers WebRequest::getValueNames + */ + public function testGetValueNames() { + $req = $this->mockWebRequest( [ 'x' => 'Value', 'y' => '' ] ); + $this->assertSame( [ 'x', 'y' ], $req->getValueNames() ); + $this->assertSame( [ 'x' ], $req->getValueNames( [ 'y' ] ), 'Exclude keys' ); + } + /** * @dataProvider provideGetIP * @covers WebRequest::getIP @@ -111,7 +365,6 @@ class WebRequestTest extends MediaWikiTestCase { public function testGetIP( $expected, $input, $squid, $xffList, $private, $description ) { $_SERVER = $input; $this->setMwGlobals( [ - 'wgSquidServersNoPurge' => $squid, 'wgUsePrivateIPs' => $private, 'wgHooks' => [ 'IsTrustedProxy' => [ @@ -123,6 +376,8 @@ class WebRequestTest extends MediaWikiTestCase { ] ] ); + $this->setService( 'ProxyLookup', new ProxyLookup( [], $squid ) ); + $request = new WebRequest(); $result = $request->getIP(); $this->assertEquals( $expected, $result, $description ); @@ -308,6 +563,7 @@ class WebRequestTest extends MediaWikiTestCase { 'wgUsePrivateIPs' => false, 'wgHooks' => [], ] ); + $this->setService( 'ProxyLookup', new ProxyLookup( [], [] ) ); $request = new WebRequest(); # Next call throw an exception about lacking an IP @@ -343,6 +599,7 @@ class WebRequestTest extends MediaWikiTestCase { [ 'en-gb' => 1, 'en-us' => '1' ], 'Two equally prefered English variants' ], + [ '_', [], 'Invalid input' ], ]; } diff --git a/tests/phpunit/includes/XmlSelectTest.php b/tests/phpunit/includes/XmlSelectTest.php index f80f5124a0..52e20bdb99 100644 --- a/tests/phpunit/includes/XmlSelectTest.php +++ b/tests/phpunit/includes/XmlSelectTest.php @@ -50,7 +50,7 @@ class XmlSelectTest extends MediaWikiTestCase { /** * Values are set following a 3-bit Gray code where two successive * values differ by only one value. - * See http://en.wikipedia.org/wiki/Gray_code + * See https://en.wikipedia.org/wiki/Gray_code */ # $name $id $default [ false, false, false, '' ], diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php index 5d1ead0c2f..8b75d56281 100644 --- a/tests/phpunit/includes/api/ApiBaseTest.php +++ b/tests/phpunit/includes/api/ApiBaseTest.php @@ -43,4 +43,87 @@ class ApiBaseTest extends ApiTestCase { ); } + /** + * @dataProvider provideGetParameterFromSettings + * @param string|null $input + * @param array $paramSettings + * @param mixed $expected + * @param string[] $warnings + */ + public function testGetParameterFromSettings( $input, $paramSettings, $expected, $warnings ) { + $mock = new MockApi(); + $wrapper = TestingAccessWrapper::newFromObject( $mock ); + + $context = new DerivativeContext( $mock ); + $context->setRequest( new FauxRequest( $input !== null ? [ 'foo' => $input ] : [] ) ); + $wrapper->mMainModule = new ApiMain( $context ); + + if ( $expected instanceof UsageException ) { + try { + $wrapper->getParameterFromSettings( 'foo', $paramSettings, true ); + } catch ( UsageException $ex ) { + $this->assertEquals( $expected, $ex ); + } + } else { + $result = $wrapper->getParameterFromSettings( 'foo', $paramSettings, true ); + $this->assertSame( $expected, $result ); + $this->assertSame( $warnings, $mock->warnings ); + } + } + + public static function provideGetParameterFromSettings() { + $warnings = [ + 'The value passed for \'foo\' contains invalid or non-normalized data. Textual data should ' . + 'be valid, NFC-normalized Unicode without C0 control characters other than ' . + 'HT (\\t), LF (\\n), and CR (\\r).' + ]; + + $c0 = ''; + $enc = ''; + for ( $i = 0; $i < 32; $i++ ) { + $c0 .= chr( $i ); + $enc .= ( $i === 9 || $i === 10 || $i === 13 ) + ? chr( $i ) + : 'ï¿½'; + } + + return [ + 'Basic param' => [ 'bar', null, 'bar', [] ], + 'Basic param, C0 controls' => [ $c0, null, $enc, $warnings ], + 'String param' => [ 'bar', '', 'bar', [] ], + 'String param, defaulted' => [ null, '', '', [] ], + 'String param, empty' => [ '', 'default', '', [] ], + 'String param, required, empty' => [ + '', + [ ApiBase::PARAM_DFLT => 'default', ApiBase::PARAM_REQUIRED => true ], + new UsageException( 'The foo parameter must be set', 'nofoo' ), + [] + ], + 'Multi-valued parameter' => [ + 'a|b|c', + [ ApiBase::PARAM_ISMULTI => true ], + [ 'a', 'b', 'c' ], + [] + ], + 'Multi-valued parameter, alternative separator' => [ + "\x1fa|b\x1fc|d", + [ ApiBase::PARAM_ISMULTI => true ], + [ 'a|b', 'c|d' ], + [] + ], + 'Multi-valued parameter, other C0 controls' => [ + $c0, + [ ApiBase::PARAM_ISMULTI => true ], + [ $enc ], + $warnings + ], + 'Multi-valued parameter, other C0 controls (2)' => [ + "\x1f" . $c0, + [ ApiBase::PARAM_ISMULTI => true ], + [ substr( $enc, 0, -3 ), '' ], + $warnings + ], + ]; + } + } diff --git a/tests/phpunit/includes/api/ApiContinuationManagerTest.php b/tests/phpunit/includes/api/ApiContinuationManagerTest.php index 6da16a0931..3ad16d1322 100644 --- a/tests/phpunit/includes/api/ApiContinuationManagerTest.php +++ b/tests/phpunit/includes/api/ApiContinuationManagerTest.php @@ -195,7 +195,6 @@ class ApiContinuationManagerTest extends MediaWikiTestCase { 'Expected exception' ); } - } } diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index 7a8e208b0c..02d0a0dc57 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -513,4 +513,57 @@ class ApiEditPageTest extends ApiTestCase { $this->assertEquals( "testing-nontext", $page->getContentModel() ); $this->assertEquals( $data, $page->getContent()->serialize() ); } + + /** + * This test verifies that after changing the content model + * of a page, undoing that edit via the API will also + * undo the content model change. + */ + public function testUndoAfterContentModelChange() { + $name = 'Help:' . __FUNCTION__; + $uploader = self::$users['uploader']->getUser(); + $sysop = self::$users['sysop']->getUser(); + $apiResult = $this->doApiRequestWithToken( [ + 'action' => 'edit', + 'title' => $name, + 'text' => 'some text', + ], null, $sysop )[0]; + + // Check success + $this->assertArrayHasKey( 'edit', $apiResult ); + $this->assertArrayHasKey( 'result', $apiResult['edit'] ); + $this->assertEquals( 'Success', $apiResult['edit']['result'] ); + $this->assertArrayHasKey( 'contentmodel', $apiResult['edit'] ); + // Content model is wikitext + $this->assertEquals( 'wikitext', $apiResult['edit']['contentmodel'] ); + + // Convert the page to JSON + $apiResult = $this->doApiRequestWithToken( [ + 'action' => 'edit', + 'title' => $name, + 'text' => '{}', + 'contentmodel' => 'json', + ], null, $uploader )[0]; + + // Check success + $this->assertArrayHasKey( 'edit', $apiResult ); + $this->assertArrayHasKey( 'result', $apiResult['edit'] ); + $this->assertEquals( 'Success', $apiResult['edit']['result'] ); + $this->assertArrayHasKey( 'contentmodel', $apiResult['edit'] ); + $this->assertEquals( 'json', $apiResult['edit']['contentmodel'] ); + + $apiResult = $this->doApiRequestWithToken( [ + 'action' => 'edit', + 'title' => $name, + 'undo' => $apiResult['edit']['newrevid'] + ], null, $sysop )[0]; + + // Check success + $this->assertArrayHasKey( 'edit', $apiResult ); + $this->assertArrayHasKey( 'result', $apiResult['edit'] ); + $this->assertEquals( 'Success', $apiResult['edit']['result'] ); + $this->assertArrayHasKey( 'contentmodel', $apiResult['edit'] ); + // Check that the contentmodel is back to wikitext now. + $this->assertEquals( 'wikitext', $apiResult['edit']['contentmodel'] ); + } } diff --git a/tests/phpunit/includes/api/ApiErrorFormatterTest.php b/tests/phpunit/includes/api/ApiErrorFormatterTest.php index 18da5afd64..d13b00be2e 100644 --- a/tests/phpunit/includes/api/ApiErrorFormatterTest.php +++ b/tests/phpunit/includes/api/ApiErrorFormatterTest.php @@ -132,7 +132,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { 'err' => [ [ 'code' => 'mainpage', - 'message' => 'mainpage', + 'key' => 'mainpage', 'params' => [ $I => 'param' ] ], $I => 'error', @@ -142,7 +142,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { 'string' => [ [ 'code' => 'mainpage', - 'message' => 'mainpage', + 'key' => 'mainpage', 'params' => [ $I => 'param' ] ], $I => 'warning', @@ -154,7 +154,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { 'errWithData' => [ [ 'code' => 'overriddenCode', - 'message' => 'mainpage', + 'key' => 'mainpage', 'params' => [ $I => 'param' ], 'overriddenData' => true ], @@ -165,7 +165,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { 'messageWithData' => [ [ 'code' => 'overriddenCode', - 'message' => 'mainpage', + 'key' => 'mainpage', 'params' => [ $I => 'param' ], 'overriddenData' => true ], @@ -174,7 +174,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { 'message' => [ [ 'code' => 'mainpage', - 'message' => 'mainpage', + 'key' => 'mainpage', 'params' => [ $I => 'param' ] ], $I => 'warning', @@ -182,12 +182,12 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { 'foo' => [ [ 'code' => 'mainpage', - 'message' => 'mainpage', + 'key' => 'mainpage', 'params' => [ $I => 'param' ] ], [ 'code' => 'parentheses', - 'message' => 'parentheses', + 'key' => 'parentheses', 'params' => [ 'foobar', $I => 'param' ] ], $I => 'warning', @@ -199,12 +199,12 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { 'status' => [ [ 'code' => 'mainpage', - 'message' => 'mainpage', + 'key' => 'mainpage', 'params' => [ $I => 'param' ] ], [ 'code' => 'parentheses', - 'message' => 'parentheses', + 'key' => 'parentheses', 'params' => [ 'foobar', $I => 'param' ] ], $I => 'error', @@ -214,17 +214,17 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase { 'status' => [ [ 'code' => 'mainpage', - 'message' => 'mainpage', + 'key' => 'mainpage', 'params' => [ $I => 'param' ] ], [ 'code' => 'parentheses', - 'message' => 'parentheses', + 'key' => 'parentheses', 'params' => [ 'foobar', $I => 'param' ] ], [ 'code' => 'overriddenCode', - 'message' => 'mainpage', + 'key' => 'mainpage', 'params' => [ $I => 'param' ], 'overriddenData' => true ], diff --git a/tests/phpunit/includes/api/ApiLoginTest.php b/tests/phpunit/includes/api/ApiLoginTest.php index 487ab84d04..ea8c9ca509 100644 --- a/tests/phpunit/includes/api/ApiLoginTest.php +++ b/tests/phpunit/includes/api/ApiLoginTest.php @@ -188,7 +188,6 @@ class ApiLoginTest extends ApiTestCase { $this->assertArrayHasKey( "login", $data[0] ); $this->assertArrayHasKey( "result", $data[0]['login'] ); $this->assertEquals( "Success", $data[0]['login']['result'] ); - $this->assertArrayHasKey( 'lgtoken', $data[0]['login'] ); } public function testBotPassword() { @@ -231,10 +230,11 @@ class ApiLoginTest extends ApiTestCase { $centralId = CentralIdLookup::factory()->centralIdFromLocalUser( $user->getUser() ); $this->assertNotEquals( 0, $centralId, 'sanity check' ); + $password = 'ngfhmjm64hv0854493hsj5nncjud2clk'; $passwordFactory = new PasswordFactory(); $passwordFactory->init( RequestContext::getMain()->getConfig() ); // A is unsalted MD5 (thus fast) ... we don't care about security here, this is test only - $passwordHash = $passwordFactory->newFromPlaintext( 'foobaz' ); + $passwordHash = $passwordFactory->newFromPlaintext( $password ); $dbw = wfGetDB( DB_MASTER ); $dbw->insert( @@ -255,7 +255,7 @@ class ApiLoginTest extends ApiTestCase { $ret = $this->doApiRequest( [ 'action' => 'login', 'lgname' => $lgName, - 'lgpassword' => 'foobaz', + 'lgpassword' => $password, ] ); $result = $ret[0]; @@ -270,7 +270,7 @@ class ApiLoginTest extends ApiTestCase { 'action' => 'login', 'lgtoken' => $token, 'lgname' => $lgName, - 'lgpassword' => 'foobaz', + 'lgpassword' => $password, ], $ret[2] ); $result = $ret[0]; diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php index 334e3b88fb..c111949d2f 100644 --- a/tests/phpunit/includes/api/ApiMainTest.php +++ b/tests/phpunit/includes/api/ApiMainTest.php @@ -58,6 +58,29 @@ class ApiMainTest extends ApiTestCase { } } + /** + * Tests the assertuser= functionality + * + * @covers ApiMain::checkAsserts + */ + public function testAssertUser() { + $user = $this->getTestUser()->getUser(); + $this->doApiRequest( [ + 'action' => 'query', + 'assertuser' => $user->getName(), + ], null, null, $user ); + + try { + $this->doApiRequest( [ + 'action' => 'query', + 'assertuser' => $user->getName() . 'X', + ], null, null, $user ); + $this->fail( 'Expected exception not thrown' ); + } catch ( UsageException $e ) { + $this->assertEquals( $e->getCodeString(), 'assertnameduserfailed' ); + } + } + /** * Test if all classes in the main module manager exists */ diff --git a/tests/phpunit/includes/api/ApiMessageTest.php b/tests/phpunit/includes/api/ApiMessageTest.php index a45015a7b3..8764b4194f 100644 --- a/tests/phpunit/includes/api/ApiMessageTest.php +++ b/tests/phpunit/includes/api/ApiMessageTest.php @@ -5,17 +5,17 @@ */ class ApiMessageTest extends MediaWikiTestCase { - private function compareMessages( $msg, $msg2 ) { + private function compareMessages( Message $msg, Message $msg2 ) { $this->assertSame( $msg->getKey(), $msg2->getKey(), 'getKey' ); $this->assertSame( $msg->getKeysToTry(), $msg2->getKeysToTry(), 'getKeysToTry' ); $this->assertSame( $msg->getParams(), $msg2->getParams(), 'getParams' ); - $this->assertSame( $msg->getFormat(), $msg2->getFormat(), 'getFormat' ); $this->assertSame( $msg->getLanguage(), $msg2->getLanguage(), 'getLanguage' ); $msg = TestingAccessWrapper::newFromObject( $msg ); $msg2 = TestingAccessWrapper::newFromObject( $msg2 ); $this->assertSame( $msg->interface, $msg2->interface, 'interface' ); $this->assertSame( $msg->useDatabase, $msg2->useDatabase, 'useDatabase' ); + $this->assertSame( $msg->format, $msg2->format, 'format' ); $this->assertSame( $msg->title ? $msg->title->getFullText() : null, $msg2->title ? $msg2->title->getFullText() : null, diff --git a/tests/phpunit/includes/api/ApiOpenSearchTest.php b/tests/phpunit/includes/api/ApiOpenSearchTest.php index 39e90c2e33..5358f294c6 100644 --- a/tests/phpunit/includes/api/ApiOpenSearchTest.php +++ b/tests/phpunit/includes/api/ApiOpenSearchTest.php @@ -9,11 +9,12 @@ class ApiOpenSearchTest extends MediaWikiTestCase { ->method( 'getSearchTypes' ) ->will( $this->returnValue( [ 'the one ring' ] ) ); + $api = $this->createApi(); $engine = $this->replaceSearchEngine(); $engine->expects( $this->any() ) ->method( 'getProfiles' ) ->will( $this->returnValueMap( [ - [ SearchEngine::COMPLETION_PROFILE_TYPE, [ + [ SearchEngine::COMPLETION_PROFILE_TYPE, $api->getUser(), [ [ 'name' => 'normal', 'desc-message' => 'normal-message', @@ -26,7 +27,6 @@ class ApiOpenSearchTest extends MediaWikiTestCase { ] ], ] ) ); - $api = $this->createApi(); $params = $api->getAllowedParams(); $this->assertArrayNotHasKey( 'offset', $params ); diff --git a/tests/phpunit/includes/api/ApiPageSetTest.php b/tests/phpunit/includes/api/ApiPageSetTest.php index 367210a2e0..ad1deee5ce 100644 --- a/tests/phpunit/includes/api/ApiPageSetTest.php +++ b/tests/phpunit/includes/api/ApiPageSetTest.php @@ -75,4 +75,25 @@ class ApiPageSetTest extends ApiTestCase { return [ $target, $pageSet ]; } + + public function testHandleNormalization() { + $context = new RequestContext(); + $context->setRequest( new FauxRequest( [ 'titles' => "a|B|a\xcc\x8a" ] ) ); + $main = new ApiMain( $context ); + $pageSet = new ApiPageSet( $main ); + $pageSet->execute(); + + $this->assertSame( + [ 0 => [ 'A' => -1, 'B' => -2, 'Ã' => -3 ] ], + $pageSet->getAllTitlesByNamespace() + ); + $this->assertSame( + [ + [ 'fromencoded' => true, 'from' => 'a%CC%8A', 'to' => 'Ã¥' ], + [ 'fromencoded' => false, 'from' => 'a', 'to' => 'A' ], + [ 'fromencoded' => false, 'from' => 'Ã¥', 'to' => 'Ã' ], + ], + $pageSet->getNormalizedTitlesAsResult() + ); + } } diff --git a/tests/phpunit/includes/api/ApiQueryAllPagesTest.php b/tests/phpunit/includes/api/ApiQueryAllPagesTest.php index 3b21ff888d..76872362cd 100644 --- a/tests/phpunit/includes/api/ApiQueryAllPagesTest.php +++ b/tests/phpunit/includes/api/ApiQueryAllPagesTest.php @@ -20,7 +20,11 @@ class ApiQueryAllPagesTest extends ApiTestCase { public function testPrefixNormalizationSearchBug() { $title = Title::newFromText( 'Category:Template:xyz' ); $page = WikiPage::factory( $title ); - $page->doEdit( 'Some text', 'inserting content' ); + + $page->doEditContent( + ContentHandler::makeContent( 'Some text', $page->getTitle() ), + 'inserting content' + ); $result = $this->doApiRequest( [ 'action' => 'query', diff --git a/tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php b/tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php index 582c0769a2..d6f315d5b3 100644 --- a/tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php +++ b/tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php @@ -477,6 +477,7 @@ class ApiQueryWatchlistRawIntegrationTest extends ApiTestCase { new TitleValue( 1, 'ApiQueryWatchlistRawIntegrationTestPage1' ), ] ); + ObjectCache::getMainWANInstance()->clearProcessCache(); $result = $this->doListWatchlistRawRequest( [ 'wrowner' => $otherUser->getName(), 'wrtoken' => '1234567890', diff --git a/tests/phpunit/includes/api/ApiResultTest.php b/tests/phpunit/includes/api/ApiResultTest.php index 7c0063d404..98e24fb666 100644 --- a/tests/phpunit/includes/api/ApiResultTest.php +++ b/tests/phpunit/includes/api/ApiResultTest.php @@ -1230,7 +1230,6 @@ class ApiResultTest extends MediaWikiTestCase { ], ], ]; - } /** @@ -1323,350 +1322,6 @@ class ApiResultTest extends MediaWikiTestCase { ], ApiResult::addMetadataToResultVars( $arr ) ); } - /** - * @covers ApiResult - */ - public function testDeprecatedFunctions() { - // Ignore ApiResult deprecation warnings during this test - set_error_handler( function ( $errno, $errstr ) use ( &$warnings ) { - if ( preg_match( '/Use of ApiResult::\S+ was deprecated in MediaWiki \d+.\d+\./', $errstr ) ) { - return true; - } - if ( preg_match( '/Use of ApiMain to ApiResult::__construct ' . - 'was deprecated in MediaWiki \d+.\d+\./', $errstr ) ) { - return true; - } - return false; - } ); - $reset = new ScopedCallback( 'restore_error_handler' ); - - $context = new DerivativeContext( RequestContext::getMain() ); - $context->setConfig( new HashConfig( [ - 'APIModules' => [], - 'APIFormatModules' => [], - 'APIMaxResultSize' => 42, - ] ) ); - $main = new ApiMain( $context ); - $result = TestingAccessWrapper::newFromObject( new ApiResult( $main ) ); - $this->assertSame( 42, $result->maxSize ); - $this->assertSame( $main->getErrorFormatter(), $result->errorFormatter ); - $this->assertSame( $main, $result->mainForContinuation ); - - $result = new ApiResult( 8388608 ); - - $result->addContentValue( null, 'test', 'content' ); - $result->addContentValue( [ 'foo', 'bar' ], 'test', 'content' ); - $result->addIndexedTagName( null, 'itn' ); - $result->addSubelementsList( null, [ 'sub' ] ); - $this->assertSame( [ - 'foo' => [ - 'bar' => [ - '*' => 'content', - ], - ], - '*' => 'content', - ], $result->getData() ); - - $arr = []; - ApiResult::setContent( $arr, 'value' ); - ApiResult::setContent( $arr, 'value2', 'foobar' ); - $this->assertSame( [ - ApiResult::META_CONTENT => 'content', - 'content' => 'value', - 'foobar' => [ - ApiResult::META_CONTENT => 'content', - 'content' => 'value2', - ], - ], $arr ); - - $result = new ApiResult( 3 ); - $formatter = new ApiErrorFormatter_BackCompat( $result ); - $result->setErrorFormatter( $formatter ); - $result->disableSizeCheck(); - $this->assertTrue( $result->addValue( null, 'foo', '1234567890' ) ); - $result->enableSizeCheck(); - $this->assertSame( 0, $result->getSize() ); - $this->assertFalse( $result->addValue( null, 'foo', '1234567890' ) ); - - $arr = [ 'foo' => [ 'bar' => 1 ] ]; - $result->setIndexedTagName_recursive( $arr, 'itn' ); - $this->assertSame( [ - 'foo' => [ - 'bar' => 1, - ApiResult::META_INDEXED_TAG_NAME => 'itn' - ], - ], $arr ); - - $status = Status::newGood(); - $status->fatal( 'parentheses', '1' ); - $status->fatal( 'parentheses', '2' ); - $status->warning( 'parentheses', '3' ); - $status->warning( 'parentheses', '4' ); - $this->assertSame( [ - [ - 'type' => 'error', - 'message' => 'parentheses', - 'params' => [ - 0 => '1', - ApiResult::META_INDEXED_TAG_NAME => 'param', - ], - ], - [ - 'type' => 'error', - 'message' => 'parentheses', - 'params' => [ - 0 => '2', - ApiResult::META_INDEXED_TAG_NAME => 'param', - ], - ], - ApiResult::META_INDEXED_TAG_NAME => 'error', - ], $result->convertStatusToArray( $status, 'error' ) ); - $this->assertSame( [ - [ - 'type' => 'warning', - 'message' => 'parentheses', - 'params' => [ - 0 => '3', - ApiResult::META_INDEXED_TAG_NAME => 'param', - ], - ], - [ - 'type' => 'warning', - 'message' => 'parentheses', - 'params' => [ - 0 => '4', - ApiResult::META_INDEXED_TAG_NAME => 'param', - ], - ], - ApiResult::META_INDEXED_TAG_NAME => 'warning', - ], $result->convertStatusToArray( $status, 'warning' ) ); - } - - /** - * @covers ApiResult - */ - public function testDeprecatedContinuation() { - // Ignore ApiResult deprecation warnings during this test - set_error_handler( function ( $errno, $errstr ) use ( &$warnings ) { - if ( preg_match( '/Use of ApiResult::\S+ was deprecated in MediaWiki \d+.\d+\./', $errstr ) ) { - return true; - } - return false; - } ); - - $reset = new ScopedCallback( 'restore_error_handler' ); - $allModules = [ - new MockApiQueryBase( 'mock1' ), - new MockApiQueryBase( 'mock2' ), - new MockApiQueryBase( 'mocklist' ), - ]; - $generator = new MockApiQueryBase( 'generator' ); - - $main = new ApiMain( RequestContext::getMain() ); - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( [ false, $allModules ], $ret ); - $result->setContinueParam( $allModules[0], 'm1continue', [ 1, 2 ] ); - $result->setContinueParam( $allModules[2], 'mlcontinue', 2 ); - $result->setGeneratorContinueParam( $generator, 'gcontinue', 3 ); - $result->endContinuation( 'raw' ); - $result->endContinuation( 'standard' ); - $this->assertSame( [ - 'mlcontinue' => 2, - 'm1continue' => '1|2', - 'continue' => '||mock2', - ], $result->getResultData( 'continue' ) ); - $this->assertSame( null, $result->getResultData( 'batchcomplete' ) ); - $this->assertSame( [ - 'mock1' => [ 'm1continue' => '1|2' ], - 'mocklist' => [ 'mlcontinue' => 2 ], - 'generator' => [ 'gcontinue' => 3 ], - ], $result->getResultData( 'query-continue' ) ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( [ false, $allModules ], $ret ); - $result->setContinueParam( $allModules[0], 'm1continue', [ 1, 2 ] ); - $result->setGeneratorContinueParam( $generator, 'gcontinue', [ 3, 4 ] ); - $result->endContinuation( 'raw' ); - $result->endContinuation( 'standard' ); - $this->assertSame( [ - 'm1continue' => '1|2', - 'continue' => '||mock2|mocklist', - ], $result->getResultData( 'continue' ) ); - $this->assertSame( null, $result->getResultData( 'batchcomplete' ) ); - $this->assertSame( [ - 'mock1' => [ 'm1continue' => '1|2' ], - 'generator' => [ 'gcontinue' => '3|4' ], - ], $result->getResultData( 'query-continue' ) ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( [ false, $allModules ], $ret ); - $result->setContinueParam( $allModules[2], 'mlcontinue', 2 ); - $result->setGeneratorContinueParam( $generator, 'gcontinue', 3 ); - $result->endContinuation( 'raw' ); - $result->endContinuation( 'standard' ); - $this->assertSame( [ - 'mlcontinue' => 2, - 'gcontinue' => 3, - 'continue' => 'gcontinue||', - ], $result->getResultData( 'continue' ) ); - $this->assertSame( true, $result->getResultData( 'batchcomplete' ) ); - $this->assertSame( [ - 'mocklist' => [ 'mlcontinue' => 2 ], - 'generator' => [ 'gcontinue' => 3 ], - ], $result->getResultData( 'query-continue' ) ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( [ false, $allModules ], $ret ); - $result->setGeneratorContinueParam( $generator, 'gcontinue', 3 ); - $result->endContinuation( 'raw' ); - $result->endContinuation( 'standard' ); - $this->assertSame( [ - 'gcontinue' => 3, - 'continue' => 'gcontinue||mocklist', - ], $result->getResultData( 'continue' ) ); - $this->assertSame( true, $result->getResultData( 'batchcomplete' ) ); - $this->assertSame( [ - 'generator' => [ 'gcontinue' => 3 ], - ], $result->getResultData( 'query-continue' ) ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( [ false, $allModules ], $ret ); - $result->setContinueParam( $allModules[0], 'm1continue', [ 1, 2 ] ); - $result->setContinueParam( $allModules[2], 'mlcontinue', 2 ); - $result->endContinuation( 'raw' ); - $result->endContinuation( 'standard' ); - $this->assertSame( [ - 'mlcontinue' => 2, - 'm1continue' => '1|2', - 'continue' => '||mock2', - ], $result->getResultData( 'continue' ) ); - $this->assertSame( null, $result->getResultData( 'batchcomplete' ) ); - $this->assertSame( [ - 'mock1' => [ 'm1continue' => '1|2' ], - 'mocklist' => [ 'mlcontinue' => 2 ], - ], $result->getResultData( 'query-continue' ) ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( [ false, $allModules ], $ret ); - $result->setContinueParam( $allModules[0], 'm1continue', [ 1, 2 ] ); - $result->endContinuation( 'raw' ); - $result->endContinuation( 'standard' ); - $this->assertSame( [ - 'm1continue' => '1|2', - 'continue' => '||mock2|mocklist', - ], $result->getResultData( 'continue' ) ); - $this->assertSame( null, $result->getResultData( 'batchcomplete' ) ); - $this->assertSame( [ - 'mock1' => [ 'm1continue' => '1|2' ], - ], $result->getResultData( 'query-continue' ) ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( [ false, $allModules ], $ret ); - $result->setContinueParam( $allModules[2], 'mlcontinue', 2 ); - $result->endContinuation( 'raw' ); - $result->endContinuation( 'standard' ); - $this->assertSame( [ - 'mlcontinue' => 2, - 'continue' => '-||mock1|mock2', - ], $result->getResultData( 'continue' ) ); - $this->assertSame( true, $result->getResultData( 'batchcomplete' ) ); - $this->assertSame( [ - 'mocklist' => [ 'mlcontinue' => 2 ], - ], $result->getResultData( 'query-continue' ) ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( null, $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( [ false, $allModules ], $ret ); - $result->endContinuation( 'raw' ); - $result->endContinuation( 'standard' ); - $this->assertSame( null, $result->getResultData( 'continue' ) ); - $this->assertSame( true, $result->getResultData( 'batchcomplete' ) ); - $this->assertSame( null, $result->getResultData( 'query-continue' ) ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( '||mock2', $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( - [ false, array_values( array_diff_key( $allModules, [ 1 => 1 ] ) ) ], - $ret - ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $ret = $result->beginContinuation( '-||', $allModules, [ 'mock1', 'mock2' ] ); - $this->assertSame( - [ true, array_values( array_diff_key( $allModules, [ 0 => 0, 1 => 1 ] ) ) ], - $ret - ); - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - try { - $result->beginContinuation( 'foo', $allModules, [ 'mock1', 'mock2' ] ); - $this->fail( 'Expected exception not thrown' ); - } catch ( UsageException $ex ) { - $this->assertSame( - 'Invalid continue param. You should pass the original value returned by the previous query', - $ex->getMessage(), - 'Expected exception' - ); - } - $main->setContinuationManager( null ); - - $result = new ApiResult( 8388608 ); - $result->setMainForContinuation( $main ); - $result->beginContinuation( '||mock2', array_slice( $allModules, 0, 2 ), - [ 'mock1', 'mock2' ] ); - try { - $result->setContinueParam( $allModules[1], 'm2continue', 1 ); - $this->fail( 'Expected exception not thrown' ); - } catch ( UnexpectedValueException $ex ) { - $this->assertSame( - 'Module \'mock2\' was not supposed to have been executed, but it was executed anyway', - $ex->getMessage(), - 'Expected exception' - ); - } - try { - $result->setContinueParam( $allModules[2], 'mlcontinue', 1 ); - $this->fail( 'Expected exception not thrown' ); - } catch ( UnexpectedValueException $ex ) { - $this->assertSame( - 'Module \'mocklist\' called ApiContinuationManager::addContinueParam ' . - 'but was not passed to ApiContinuationManager::__construct', - $ex->getMessage(), - 'Expected exception' - ); - } - $main->setContinuationManager( null ); - - } - public function testObjectSerialization() { $arr = []; ApiResult::setValue( $arr, 'foo', (object)[ 'a' => 1, 'b' => 2 ] ); @@ -1724,7 +1379,6 @@ class ApiResultTest extends MediaWikiTestCase { 'two' => 2, ], $arr['foo'] ); } - } class ApiResultTestStringifiableObject { diff --git a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php index 6359983d6e..d8282be159 100644 --- a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php +++ b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php @@ -25,7 +25,6 @@ class ApiRevisionDeleteTest extends ApiTestCase { $this->revs[] = Title::newFromText( self::$page ) ->getLatestRevID( Title::GAID_FOR_UPDATE ); } - } public function testHidingRevisions() { diff --git a/tests/phpunit/includes/api/MockApi.php b/tests/phpunit/includes/api/MockApi.php index 9a64d0864a..d7db538273 100644 --- a/tests/phpunit/includes/api/MockApi.php +++ b/tests/phpunit/includes/api/MockApi.php @@ -1,12 +1,18 @@ warnings[] = $warning; + } + public function getAllowedParams() { return [ 'filename' => null, diff --git a/tests/phpunit/includes/api/RandomImageGenerator.php b/tests/phpunit/includes/api/RandomImageGenerator.php index 78cb7fb152..d5c17ee8ba 100644 --- a/tests/phpunit/includes/api/RandomImageGenerator.php +++ b/tests/phpunit/includes/api/RandomImageGenerator.php @@ -218,7 +218,7 @@ class RandomImageGenerator { } /** - * Given array( array('x' => 10, 'y' => 20), array( 'x' => 30, y=> 5 ) ) + * Given [ [ 'x' => 10, 'y' => 20 ], [ 'x' => 30, y=> 5 ] ] * returns "10,20 30,5" * Useful for SVG and imagemagick command line arguments * @param array $shape Array of arrays, each array containing x & y keys mapped to numeric values @@ -430,7 +430,7 @@ class RandomImageGenerator { /** * Get an array of random pairs of random words, like - * array( array( 'foo', 'bar' ), array( 'quux', 'baz' ) ); + * [ [ 'foo', 'bar' ], [ 'quux', 'baz' ] ]; * * @param int $number Number of pairs * @return array Two-element arrays diff --git a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php index a6f22b1c38..38a1d68591 100644 --- a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php @@ -15,7 +15,11 @@ class ApiQueryRevisionsTest extends ApiTestCase { $pageName = 'Help:' . __METHOD__; $title = Title::newFromText( $pageName ); $page = WikiPage::factory( $title ); - $page->doEdit( 'Some text', 'inserting content' ); + + $page->doEditContent( + ContentHandler::makeContent( 'Some text', $page->getTitle() ), + 'inserting content' + ); $apiResult = $this->doApiRequest( [ 'action' => 'query', diff --git a/tests/phpunit/includes/api/query/ApiQueryTest.php b/tests/phpunit/includes/api/query/ApiQueryTest.php index 504b16afd4..8cb2327dfb 100644 --- a/tests/phpunit/includes/api/query/ApiQueryTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryTest.php @@ -43,6 +43,7 @@ class ApiQueryTest extends ApiTestCase { $this->assertEquals( [ + 'fromencoded' => false, 'from' => 'Project:articleA', 'to' => $to->getPrefixedText(), ], @@ -51,6 +52,7 @@ class ApiQueryTest extends ApiTestCase { $this->assertEquals( [ + 'fromencoded' => false, 'from' => 'article_B', 'to' => 'Article B' ], diff --git a/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php index a1cdf7e7cc..a57682b66e 100644 --- a/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/AbstractPasswordPrimaryAuthenticationProviderTest.php @@ -2,6 +2,8 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; + /** * @group AuthManager * @covers MediaWiki\Auth\AbstractPasswordPrimaryAuthenticationProvider @@ -26,7 +28,7 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa $provider = $this->getMockForAbstractClass( AbstractPasswordPrimaryAuthenticationProvider::class ); - $provider->setConfig( \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); + $provider->setConfig( MediaWikiServices::getInstance()->getMainConfig() ); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); $obj = $providerPriv->getPasswordFactory(); @@ -38,7 +40,7 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa $provider = $this->getMockForAbstractClass( AbstractPasswordPrimaryAuthenticationProvider::class ); - $provider->setConfig( \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); + $provider->setConfig( MediaWikiServices::getInstance()->getMainConfig() ); $provider->setLogger( new \Psr\Log\NullLogger() ); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); @@ -56,7 +58,7 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa ); $provider->setConfig( new \MultiConfig( [ $config, - \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ] ) ); $provider->setLogger( new \Psr\Log\NullLogger() ); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); @@ -105,7 +107,7 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa $provider = $this->getMockForAbstractClass( AbstractPasswordPrimaryAuthenticationProvider::class ); - $provider->setConfig( \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); + $provider->setConfig( MediaWikiServices::getInstance()->getMainConfig() ); $provider->setLogger( new \Psr\Log\NullLogger() ); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); @@ -121,7 +123,8 @@ class AbstractPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCa ] ); $manager = new AuthManager( - new \FauxRequest(), \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + new \FauxRequest(), + MediaWikiServices::getInstance()->getMainConfig() ); $provider = $this->getMockForAbstractClass( diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php index 788d304295..f57db11b23 100644 --- a/tests/phpunit/includes/auth/AuthManagerTest.php +++ b/tests/phpunit/includes/auth/AuthManagerTest.php @@ -6,6 +6,7 @@ use MediaWiki\Session\SessionInfo; use MediaWiki\Session\UserInfo; use Psr\Log\LogLevel; use StatusValue; +use Wikimedia\ScopedCallback; /** * @group AuthManager @@ -184,7 +185,7 @@ class AuthManagerTest extends \MediaWikiTestCase { $rProp = new \ReflectionProperty( AuthManager::class, 'instance' ); $rProp->setAccessible( true ); $old = $rProp->getValue(); - $cb = new \ScopedCallback( [ $rProp, 'setValue' ], [ $old ] ); + $cb = new ScopedCallback( [ $rProp, 'setValue' ], [ $old ] ); $rProp->setValue( null ); $singleton = AuthManager::singleton(); @@ -202,11 +203,11 @@ class AuthManagerTest extends \MediaWikiTestCase { list( $provider, $reset ) = $this->getMockSessionProvider( false ); $this->assertFalse( $this->manager->canAuthenticateNow() ); - \ScopedCallback::consume( $reset ); + ScopedCallback::consume( $reset ); list( $provider, $reset ) = $this->getMockSessionProvider( true ); $this->assertTrue( $this->manager->canAuthenticateNow() ); - \ScopedCallback::consume( $reset ); + ScopedCallback::consume( $reset ); } public function testNormalizeUsername() { @@ -385,7 +386,7 @@ class AuthManagerTest extends \MediaWikiTestCase { $this->unhook( 'SecuritySensitiveOperationStatus' ); } - \ScopedCallback::consume( $reset ); + ScopedCallback::consume( $reset ); } public function onSecuritySensitiveOperationStatus( &$status, $operation, $session, $time ) { @@ -585,7 +586,7 @@ class AuthManagerTest extends \MediaWikiTestCase { $this->initializeManager(); $context = \RequestContext::getMain(); - $reset = new \ScopedCallback( [ $context, 'setLanguage' ], [ $context->getLanguage() ] ); + $reset = new ScopedCallback( [ $context, 'setLanguage' ], [ $context->getLanguage() ] ); $context->setLanguage( 'de' ); $this->setMwGlobals( 'wgContLang', \Language::factory( 'zh' ) ); @@ -694,7 +695,6 @@ class AuthManagerTest extends \MediaWikiTestCase { $ex->getMessage() ); } - } public function testBeginAuthentication() { @@ -712,7 +712,7 @@ class AuthManagerTest extends \MediaWikiTestCase { } $this->unhook( 'UserLoggedIn' ); $this->assertNull( $this->request->getSession()->getSecret( 'AuthManager::authnState' ) ); - \ScopedCallback::consume( $reset ); + ScopedCallback::consume( $reset ); $this->initializeManager( true ); // CreatedAccountAuthenticationRequest @@ -1449,11 +1449,11 @@ class AuthManagerTest extends \MediaWikiTestCase { ]; $block = new \Block( $blockOptions ); $block->insert(); - $scopeVariable = new \ScopedCallback( [ $block, 'delete' ] ); + $scopeVariable = new ScopedCallback( [ $block, 'delete' ] ); $status = $this->manager->checkAccountCreatePermissions( new \User ); $this->assertFalse( $status->isOK() ); $this->assertTrue( $status->hasMessage( 'cantcreateaccount-range-text' ) ); - \ScopedCallback::consume( $scopeVariable ); + ScopedCallback::consume( $scopeVariable ); $this->setMwGlobals( [ 'wgEnableDnsBlacklist' => true, @@ -2674,7 +2674,7 @@ class AuthManagerTest extends \MediaWikiTestCase { $this->assertEquals( 0, $session->getUser()->getId() ); $this->assertSame( [ [ LogLevel::INFO, 'creating new user ({username}) - from: {from}' ], - [ LogLevel::ERROR, '{username} failed with message {message}' ], + [ LogLevel::ERROR, '{username} failed with message {msg}' ], ], $logger->getBuffer() ); $logger->clearBuffer(); $this->assertSame( null, $session->get( 'AuthManager::AutoCreateBlacklist' ) ); @@ -2709,9 +2709,11 @@ class AuthManagerTest extends \MediaWikiTestCase { $session->clear(); $user = $this->getMock( 'User', [ 'addToDatabase' ] ); $user->expects( $this->once() )->method( 'addToDatabase' ) - ->will( $this->returnCallback( function () use ( $username ) { - $status = \User::newFromName( $username )->addToDatabase(); + ->will( $this->returnCallback( function () use ( $username, &$user ) { + $oldUser = \User::newFromName( $username ); + $status = $oldUser->addToDatabase(); $this->assertTrue( $status->isOK(), 'sanity check' ); + $user->setId( $oldUser->getId() ); return \Status::newFatal( 'userexists' ); } ) ); $user->setName( $username ); @@ -3262,7 +3264,6 @@ class AuthManagerTest extends \MediaWikiTestCase { $this->manager->removeAuthenticationSessionData( null ); $this->assertNull( $this->manager->getAuthenticationSessionData( 'foo' ) ); $this->assertNull( $this->manager->getAuthenticationSessionData( 'bar' ) ); - } public function testCanLinkAccounts() { diff --git a/tests/phpunit/includes/auth/AuthenticationResponseTest.php b/tests/phpunit/includes/auth/AuthenticationResponseTest.php index 477b1617f5..194b49e01a 100644 --- a/tests/phpunit/includes/auth/AuthenticationResponseTest.php +++ b/tests/phpunit/includes/auth/AuthenticationResponseTest.php @@ -16,6 +16,7 @@ class AuthenticationResponseTest extends \MediaWikiTestCase { public function testConstructors( $constructor, $args, $expect ) { if ( is_array( $expect ) ) { $res = new AuthenticationResponse(); + $res->messageType = 'warning'; foreach ( $expect as $field => $value ) { $res->$field = $value; } @@ -51,6 +52,7 @@ class AuthenticationResponseTest extends \MediaWikiTestCase { [ 'newFail', [ $msg ], [ 'status' => AuthenticationResponse::FAIL, 'message' => $msg, + 'messageType' => 'error', ] ], [ 'newRestart', [ $msg ], [ @@ -66,6 +68,21 @@ class AuthenticationResponseTest extends \MediaWikiTestCase { 'status' => AuthenticationResponse::UI, 'neededRequests' => [ $req ], 'message' => $msg, + 'messageType' => 'warning', + ] ], + + [ 'newUI', [ [ $req ], $msg, 'warning' ], [ + 'status' => AuthenticationResponse::UI, + 'neededRequests' => [ $req ], + 'message' => $msg, + 'messageType' => 'warning', + ] ], + + [ 'newUI', [ [ $req ], $msg, 'error' ], [ + 'status' => AuthenticationResponse::UI, + 'neededRequests' => [ $req ], + 'message' => $msg, + 'messageType' => 'error', ] ], [ 'newUI', [ [], $msg ], new \InvalidArgumentException( '$reqs may not be empty' ) diff --git a/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php index e6d3ecfa12..68f574b6b4 100644 --- a/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php @@ -152,7 +152,7 @@ class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiTestCase ]; $block = new \Block( $blockOptions ); $block->insert(); - $scopeVariable = new \ScopedCallback( [ $block, 'delete' ] ); + $scopeVariable = new \Wikimedia\ScopedCallback( [ $block, 'delete' ] ); $user = \User::newFromName( 'UTNormalUser' ); if ( $user->getID() == 0 ) { diff --git a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php index c52c3e9f54..ec4bea11a1 100644 --- a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php @@ -104,6 +104,5 @@ class EmailNotificationSecondaryAuthenticationProviderTest extends \PHPUnit_Fram $authManager->setAuthenticationSessionData( 'no-email', true ); $provider->setManager( $authManager ); $provider->beginSecondaryAccountCreation( $userNotExpectsConfirmation, $creator, [] ); - } } diff --git a/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php b/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php index d482453152..b96455e091 100644 --- a/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php @@ -2,6 +2,8 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; + /** * @group AuthManager * @group Database @@ -17,7 +19,8 @@ class LegacyHookPreAuthenticationProviderTest extends \MediaWikiTestCase { $request->expects( $this->any() )->method( 'getIP' )->will( $this->returnValue( '127.0.0.42' ) ); $manager = new AuthManager( - $request, \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + $request, + MediaWikiServices::getInstance()->getMainConfig() ); $provider = new LegacyHookPreAuthenticationProvider(); diff --git a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php index 088dd00fe8..cb34be295d 100644 --- a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php @@ -2,6 +2,8 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; + /** * @group AuthManager * @group Database @@ -28,7 +30,7 @@ class LocalPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCase } $config = new \MultiConfig( [ $this->config, - \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ] ); if ( !$this->manager ) { @@ -328,7 +330,6 @@ class LocalPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCase AuthenticationResponse::newPass( $userName ), $provider->beginPrimaryAuthentication( $reqs ) ); - } /** @@ -645,7 +646,6 @@ class LocalPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCase $this->assertNull( $provider->finishAccountCreation( $user, $user, $res2 ) ); $ret = $provider->beginPrimaryAuthentication( $reqs ); $this->assertEquals( AuthenticationResponse::PASS, $ret->status, 'new password is set' ); - } } diff --git a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php index 515a5b311e..bc7d65e81d 100644 --- a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php @@ -2,6 +2,9 @@ namespace MediaWiki\Auth; +use MediaWiki\MediaWikiServices; +use Wikimedia\ScopedCallback; + /** * @group AuthManager * @group Database @@ -30,7 +33,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC } $config = new \MultiConfig( [ $this->config, - \ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ] ); if ( !$this->manager ) { @@ -70,7 +73,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC } ); } - return new \ScopedCallback( function () { + return new ScopedCallback( function () { \Hooks::clear( 'AlternateUserMailer' ); \Hooks::register( 'AlternateUserMailer', function () { return false; @@ -122,6 +125,8 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC } public function testTestUserCanAuthenticate() { + $user = self::getMutableTestUser()->getUser(); + $dbw = wfGetDB( DB_MASTER ); $passwordFactory = new \PasswordFactory(); @@ -142,9 +147,9 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC 'user_newpassword' => \PasswordFactory::newInvalidPassword()->toString(), 'user_newpass_time' => null, ], - [ 'user_name' => 'UTSysop' ] + [ 'user_id' => $user->getId() ] ); - $this->assertFalse( $provider->testUserCanAuthenticate( 'UTSysop' ) ); + $this->assertFalse( $provider->testUserCanAuthenticate( $user->getName() ) ); $dbw->update( 'user', @@ -152,10 +157,10 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC 'user_newpassword' => $pwhash, 'user_newpass_time' => null, ], - [ 'user_name' => 'UTSysop' ] + [ 'user_id' => $user->getId() ] ); - $this->assertTrue( $provider->testUserCanAuthenticate( 'UTSysop' ) ); - $this->assertTrue( $provider->testUserCanAuthenticate( 'uTSysop' ) ); + $this->assertTrue( $provider->testUserCanAuthenticate( $user->getName() ) ); + $this->assertTrue( $provider->testUserCanAuthenticate( lcfirst( $user->getName() ) ) ); $dbw->update( 'user', @@ -163,12 +168,12 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC 'user_newpassword' => $pwhash, 'user_newpass_time' => $dbw->timestamp( time() - 10 ), ], - [ 'user_name' => 'UTSysop' ] + [ 'user_id' => $user->getId() ] ); $providerPriv->newPasswordExpiry = 100; - $this->assertTrue( $provider->testUserCanAuthenticate( 'UTSysop' ) ); + $this->assertTrue( $provider->testUserCanAuthenticate( $user->getName() ) ); $providerPriv->newPasswordExpiry = 1; - $this->assertFalse( $provider->testUserCanAuthenticate( 'UTSysop' ) ); + $this->assertFalse( $provider->testUserCanAuthenticate( $user->getName() ) ); $dbw->update( 'user', @@ -176,7 +181,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC 'user_newpassword' => \PasswordFactory::newInvalidPassword()->toString(), 'user_newpass_time' => null, ], - [ 'user_name' => 'UTSysop' ] + [ 'user_id' => $user->getId() ] ); } @@ -229,13 +234,15 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC } public function testAuthentication() { + $user = self::getMutableTestUser()->getUser(); + $password = 'TemporaryPassword'; $hash = ':A:' . md5( $password ); $dbw = wfGetDB( DB_MASTER ); $dbw->update( 'user', [ 'user_newpassword' => $hash, 'user_newpass_time' => $dbw->timestamp( time() - 10 ) ], - [ 'user_name' => 'UTSysop' ] + [ 'user_id' => $user->getId() ] ); $req = new PasswordAuthenticationRequest(); @@ -284,7 +291,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC ); // Validation failure - $req->username = 'UTSysop'; + $req->username = $user->getName(); $req->password = $password; $this->validity = \Status::newFatal( 'arbitrary-failure' ); $ret = $provider->beginPrimaryAuthentication( $reqs ); @@ -301,20 +308,20 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC $this->manager->removeAuthenticationSessionData( null ); $this->validity = \Status::newGood(); $this->assertEquals( - AuthenticationResponse::newPass( 'UTSysop' ), + AuthenticationResponse::newPass( $user->getName() ), $provider->beginPrimaryAuthentication( $reqs ) ); $this->assertNotNull( $this->manager->getAuthenticationSessionData( 'reset-pass' ) ); $this->manager->removeAuthenticationSessionData( null ); $this->validity = \Status::newGood(); - $req->username = 'uTSysop'; + $req->username = lcfirst( $user->getName() ); $this->assertEquals( - AuthenticationResponse::newPass( 'UTSysop' ), + AuthenticationResponse::newPass( $user->getName() ), $provider->beginPrimaryAuthentication( $reqs ) ); $this->assertNotNull( $this->manager->getAuthenticationSessionData( 'reset-pass' ) ); - $req->username = 'UTSysop'; + $req->username = $user->getName(); // Expired password $providerPriv->newPasswordExpiry = 1; @@ -341,7 +348,6 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC 'wrongpassword', $ret->message->getKey() ); - } /** @@ -408,20 +414,19 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC $oldpass = 'OldTempPassword'; $newpass = 'NewTempPassword'; - $hash = ':A:' . md5( $oldpass ); $dbw = wfGetDB( DB_MASTER ); + $oldHash = $dbw->selectField( 'user', 'user_newpassword', [ 'user_name' => $cuser ] ); + $cb = new ScopedCallback( function () use ( $dbw, $cuser, $oldHash ) { + $dbw->update( 'user', [ 'user_newpassword' => $oldHash ], [ 'user_name' => $cuser ] ); + } ); + + $hash = ':A:' . md5( $oldpass ); $dbw->update( 'user', [ 'user_newpassword' => $hash, 'user_newpass_time' => $dbw->timestamp( time() + 10 ) ], - [ 'user_name' => 'UTSysop' ] + [ 'user_name' => $cuser ] ); - $dbw = wfGetDB( DB_MASTER ); - $oldHash = $dbw->selectField( 'user', 'user_newpassword', [ 'user_name' => $cuser ] ); - $cb = new \ScopedCallback( function () use ( $dbw, $cuser, $oldHash ) { - $dbw->update( 'user', [ 'user_newpassword' => $oldHash ], [ 'user_name' => $cuser ] ); - } ); - $provider = $this->getProvider(); // Sanity check @@ -448,7 +453,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC $changeReq->password = $newpass; $resetMailer = $this->hookMailer(); $provider->providerChangeAuthenticationData( $changeReq ); - \ScopedCallback::consume( $resetMailer ); + ScopedCallback::consume( $resetMailer ); $loginReq->password = $oldpass; $ret = $provider->beginPrimaryAuthentication( $loginReqs ); @@ -500,22 +505,15 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC } public function testProviderChangeAuthenticationDataEmail() { + $user = self::getMutableTestUser()->getUser(); + $dbw = wfGetDB( DB_MASTER ); $dbw->update( 'user', [ 'user_newpass_time' => $dbw->timestamp( time() - 5 * 3600 ) ], - [ 'user_name' => 'UTSysop' ] + [ 'user_id' => $user->getId() ] ); - $user = \User::newFromName( 'UTSysop' ); - $reset = new \ScopedCallback( function ( $email ) use ( $user ) { - $user->setEmail( $email ); - $user->saveSettings(); - }, [ $user->getEmail() ] ); - - $user->setEmail( 'test@localhost.localdomain' ); - $user->saveSettings(); - $req = TemporaryPasswordAuthenticationRequest::newRandom(); $req->username = $user->getName(); $req->mailpassword = true; @@ -523,10 +521,6 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC $provider = $this->getProvider( [ 'emailEnabled' => false ] ); $status = $provider->providerAllowsAuthenticationDataChange( $req, true ); $this->assertEquals( \StatusValue::newFatal( 'passwordreset-emaildisabled' ), $status ); - $req->hasBackchannel = true; - $status = $provider->providerAllowsAuthenticationDataChange( $req, true ); - $this->assertFalse( $status->hasMessage( 'passwordreset-emaildisabled' ) ); - $req->hasBackchannel = false; $provider = $this->getProvider( [ 'passwordReminderResendTime' => 10 ] ); $status = $provider->providerAllowsAuthenticationDataChange( $req, true ); @@ -539,7 +533,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC $dbw->update( 'user', [ 'user_newpass_time' => $dbw->timestamp( time() + 5 * 3600 ) ], - [ 'user_name' => 'UTSysop' ] + [ 'user_id' => $user->getId() ] ); $provider = $this->getProvider( [ 'passwordReminderResendTime' => 0 ] ); $status = $provider->providerAllowsAuthenticationDataChange( $req, true ); @@ -563,21 +557,21 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC $status = $provider->providerAllowsAuthenticationDataChange( $req, true ); $this->assertEquals( \StatusValue::newGood(), $status ); - $req->caller = 'UTSysop'; + $req->caller = $user->getName(); $status = $provider->providerAllowsAuthenticationDataChange( $req, true ); $this->assertEquals( \StatusValue::newGood(), $status ); $mailed = false; $resetMailer = $this->hookMailer( function ( $headers, $to, $from, $subject, $body ) - use ( &$mailed, $req ) + use ( &$mailed, $req, $user ) { $mailed = true; - $this->assertSame( 'test@localhost.localdomain', $to[0]->address ); + $this->assertSame( $user->getEmail(), $to[0]->address ); $this->assertContains( $req->password, $body ); return false; } ); $provider->providerChangeAuthenticationData( $req ); - \ScopedCallback::consume( $resetMailer ); + ScopedCallback::consume( $resetMailer ); $this->assertTrue( $mailed ); $priv = \TestingAccessWrapper::newFromObject( $provider ); @@ -658,12 +652,10 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC $this->assertEquals( $expect, $provider->beginPrimaryAccountCreation( $user, $user, $reqs ) ); $this->assertNull( $this->manager->getAuthenticationSessionData( 'no-email' ) ); - // We have to cheat a bit to avoid having to add a new user to - // the database to test the actual setting of the password works right - $user = \User::newFromName( 'UTSysop' ); + $user = self::getMutableTestUser()->getUser(); $req->username = $authreq->username = $user->getName(); $req->password = $authreq->password = 'NewPassword'; - $expect = AuthenticationResponse::newPass( 'UTSysop' ); + $expect = AuthenticationResponse::newPass( $user->getName() ); $expect->createRequest = $req; $res2 = $provider->beginPrimaryAccountCreation( $user, $user, $reqs ); @@ -680,12 +672,8 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC public function testAccountCreationEmail() { $creator = \User::newFromName( 'Foo' ); - $user = \User::newFromName( 'UTSysop' ); - $reset = new \ScopedCallback( function ( $email ) use ( $user ) { - $user->setEmail( $email ); - $user->saveSettings(); - }, [ $user->getEmail() ] ); + $user = self::getMutableTestUser()->getUser(); $user->setEmail( null ); $req = TemporaryPasswordAuthenticationRequest::newRandom(); @@ -695,18 +683,10 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC $provider = $this->getProvider( [ 'emailEnabled' => false ] ); $status = $provider->testForAccountCreation( $user, $creator, [ $req ] ); $this->assertEquals( \StatusValue::newFatal( 'emaildisabled' ), $status ); - $req->hasBackchannel = true; - $status = $provider->testForAccountCreation( $user, $creator, [ $req ] ); - $this->assertFalse( $status->hasMessage( 'emaildisabled' ) ); - $req->hasBackchannel = false; $provider = $this->getProvider( [ 'emailEnabled' => true ] ); $status = $provider->testForAccountCreation( $user, $creator, [ $req ] ); $this->assertEquals( \StatusValue::newFatal( 'noemailcreate' ), $status ); - $req->hasBackchannel = true; - $status = $provider->testForAccountCreation( $user, $creator, [ $req ] ); - $this->assertFalse( $status->hasMessage( 'noemailcreate' ) ); - $req->hasBackchannel = false; $user->setEmail( 'test@localhost.localdomain' ); $status = $provider->testForAccountCreation( $user, $creator, [ $req ] ); @@ -722,9 +702,9 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC return false; } ); - $expect = AuthenticationResponse::newPass( 'UTSysop' ); + $expect = AuthenticationResponse::newPass( $user->getName() ); $expect->createRequest = clone( $req ); - $expect->createRequest->username = 'UTSysop'; + $expect->createRequest->username = $user->getName(); $res = $provider->beginPrimaryAccountCreation( $user, $creator, [ $req ] ); $this->assertEquals( $expect, $res ); $this->assertTrue( $this->manager->getAuthenticationSessionData( 'no-email' ) ); @@ -733,7 +713,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC $this->assertSame( 'byemail', $provider->finishAccountCreation( $user, $creator, $res ) ); $this->assertTrue( $mailed ); - \ScopedCallback::consume( $resetMailer ); + ScopedCallback::consume( $resetMailer ); $this->assertTrue( $mailed ); } diff --git a/tests/phpunit/includes/auth/ThrottlePreAuthenticationProviderTest.php b/tests/phpunit/includes/auth/ThrottlePreAuthenticationProviderTest.php index aa6f0e8dd2..20f4cbc44d 100644 --- a/tests/phpunit/includes/auth/ThrottlePreAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/ThrottlePreAuthenticationProviderTest.php @@ -12,7 +12,10 @@ class ThrottlePreAuthenticationProviderTest extends \MediaWikiTestCase { $provider = new ThrottlePreAuthenticationProvider(); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); $config = new \HashConfig( [ - 'AccountCreationThrottle' => 123, + 'AccountCreationThrottle' => [ [ + 'count' => 123, + 'seconds' => 86400, + ] ], 'PasswordAttemptThrottle' => [ [ 'count' => 5, 'seconds' => 300, @@ -38,7 +41,10 @@ class ThrottlePreAuthenticationProviderTest extends \MediaWikiTestCase { ] ); $providerPriv = \TestingAccessWrapper::newFromObject( $provider ); $config = new \HashConfig( [ - 'AccountCreationThrottle' => 123, + 'AccountCreationThrottle' => [ [ + 'count' => 123, + 'seconds' => 86400, + ] ], 'PasswordAttemptThrottle' => [ [ 'count' => 5, 'seconds' => 300, @@ -122,18 +128,18 @@ class ThrottlePreAuthenticationProviderTest extends \MediaWikiTestCase { } $this->assertEquals( - \StatusValue::newGood(), - $provider->testForAccountCreation( $user, $creator, [] ), + true, + $provider->testForAccountCreation( $user, $creator, [] )->isOK(), 'attempt #1' ); $this->assertEquals( - \StatusValue::newGood(), - $provider->testForAccountCreation( $user, $creator, [] ), + true, + $provider->testForAccountCreation( $user, $creator, [] )->isOK(), 'attempt #2' ); $this->assertEquals( - $succeed ? \StatusValue::newGood() : \StatusValue::newFatal( 'acct_creation_throttle_hit', 2 ), - $provider->testForAccountCreation( $user, $creator, [] ), + $succeed ? true : false, + $provider->testForAccountCreation( $user, $creator, [] )->isOK(), 'attempt #3' ); } diff --git a/tests/phpunit/includes/auth/ThrottlerTest.php b/tests/phpunit/includes/auth/ThrottlerTest.php index 5806003f64..c945885c76 100644 --- a/tests/phpunit/includes/auth/ThrottlerTest.php +++ b/tests/phpunit/includes/auth/ThrottlerTest.php @@ -196,7 +196,7 @@ class ThrottlerTest extends \MediaWikiTestCase { ->setMethods( [ 'log' ] ) ->getMockForAbstractClass(); $logger->expects( $this->once() )->method( 'log' )->with( $this->anything(), $this->anything(), [ - 'type' => 'custom', + 'throttle' => 'custom', 'index' => 0, 'ip' => '1.2.3.4', 'username' => 'SomeUser', diff --git a/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php b/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php index 7fe335117c..7dea123c12 100644 --- a/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php +++ b/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php @@ -36,7 +36,6 @@ class UserDataAuthenticationRequestTest extends AuthenticationRequestTestCase { $this->assertSame( $email ?: 'default@example.com', $user->getEmail() ); $this->assertSame( $realname ?: 'Fake Name', $user->getRealName() ); } - } public static function providePopulateUser() { diff --git a/tests/phpunit/includes/cache/GenderCacheTest.php b/tests/phpunit/includes/cache/GenderCacheTest.php index 9c723c028d..e5bb2379ef 100644 --- a/tests/phpunit/includes/cache/GenderCacheTest.php +++ b/tests/phpunit/includes/cache/GenderCacheTest.php @@ -1,4 +1,5 @@ getGenderCache(); $username = isset( self::$nameMap[$userKey] ) ? self::$nameMap[$userKey] : $userKey; $gender = $genderCache->getGenderOf( $username ); $this->assertEquals( $gender, $expectedGender, "GenderCache normal" ); @@ -53,7 +54,7 @@ class GenderCacheTest extends MediaWikiLangTestCase { */ public function testUserObjects( $userKey, $expectedGender ) { $username = isset( self::$nameMap[$userKey] ) ? self::$nameMap[$userKey] : $userKey; - $genderCache = GenderCache::singleton(); + $genderCache = MediaWikiServices::getInstance()->getGenderCache(); $gender = $genderCache->getGenderOf( $username ); $this->assertEquals( $gender, $expectedGender, "GenderCache normal" ); } @@ -79,7 +80,7 @@ class GenderCacheTest extends MediaWikiLangTestCase { */ public function testStripSubpages( $userKey, $expectedGender ) { $username = isset( self::$nameMap[$userKey] ) ? self::$nameMap[$userKey] : $userKey; - $genderCache = GenderCache::singleton(); + $genderCache = MediaWikiServices::getInstance()->getGenderCache(); $gender = $genderCache->getGenderOf( "$username/subpage" ); $this->assertEquals( $gender, $expectedGender, "GenderCache must strip of subpages" ); } diff --git a/tests/phpunit/includes/changes/RecentChangeTest.php b/tests/phpunit/includes/changes/RecentChangeTest.php index 45f1382c47..995c4be16b 100644 --- a/tests/phpunit/includes/changes/RecentChangeTest.php +++ b/tests/phpunit/includes/changes/RecentChangeTest.php @@ -1,4 +1,5 @@ getConfigFactory(); $this->assertInstanceOf( 'Config', $factory->makeConfig( 'main' ) ); } diff --git a/tests/phpunit/includes/content/FileContentHandlerTest.php b/tests/phpunit/includes/content/FileContentHandlerTest.php new file mode 100644 index 0000000000..276a86ee5e --- /dev/null +++ b/tests/phpunit/includes/content/FileContentHandlerTest.php @@ -0,0 +1,50 @@ +handler = new FileContentHandler(); + } + + public function testIndexMapping() { + $mockEngine = $this->getMock( 'SearchEngine' ); + + $mockEngine->expects( $this->atLeastOnce() ) + ->method( 'makeSearchFieldMapping' ) + ->willReturnCallback( function ( $name, $type ) { + $mockField = + $this->getMockBuilder( 'SearchIndexFieldDefinition' ) + ->setMethods( [ 'getMapping' ] ) + ->setConstructorArgs( [ $name, $type ] ) + ->getMock(); + return $mockField; + } ); + + $map = $this->handler->getFieldsForSearchIndex( $mockEngine ); + $expect = [ + 'file_media_type' => 1, + 'file_mime' => 1, + 'file_size' => 1, + 'file_width' => 1, + 'file_height' => 1, + 'file_bits' => 1, + 'file_resolution' => 1, + 'file_text' => 1, + ]; + foreach ( $map as $name => $field ) { + $this->assertInstanceOf( 'SearchIndexField', $field ); + $this->assertEquals( $name, $field->getName() ); + unset( $expect[$name] ); + } + $this->assertEmpty( $expect ); + } +} diff --git a/tests/phpunit/includes/content/JsonContentHandlerTest.php b/tests/phpunit/includes/content/JsonContentHandlerTest.php new file mode 100644 index 0000000000..abfb6733a5 --- /dev/null +++ b/tests/phpunit/includes/content/JsonContentHandlerTest.php @@ -0,0 +1,14 @@ +makeEmptyContent(); + $this->assertInstanceOf( JsonContent::class, $content ); + $this->assertTrue( $content->isValid() ); + } +} diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php index 9d4abe857d..ec97d76371 100644 --- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php +++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php @@ -249,11 +249,20 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase { $title = Title::newFromText( 'Somefile.jpg', NS_FILE ); $page = new WikiPage( $title ); + $fileHandler = $this->getMockBuilder( FileContentHandler::class ) + ->disableOriginalConstructor() + ->setMethods( [ 'getDataForSearchIndex' ] ) + ->getMock(); + $handler = $this->getMockBuilder( WikitextContentHandler::class ) ->disableOriginalConstructor() - ->setMethods( [ 'getFileText' ] ) + ->setMethods( [ 'getFileHandler' ] ) ->getMock(); - $handler->method( 'getFileText' )->will( $this->returnValue( 'This is file content' ) ); + + $handler->method( 'getFileHandler' )->will( $this->returnValue( $fileHandler ) ); + $fileHandler->expects( $this->once() ) + ->method( 'getDataForSearchIndex' ) + ->will( $this->returnValue( [ 'file_text' => 'This is file content' ] ) ); $data = $handler->getDataForSearchIndex( $page, new ParserOutput(), $mockEngine ); $this->assertArrayHasKey( 'file_text', $data ); diff --git a/tests/phpunit/includes/content/WikitextStructureTest.php b/tests/phpunit/includes/content/WikitextStructureTest.php index 4301fb8c35..49907c8532 100644 --- a/tests/phpunit/includes/content/WikitextStructureTest.php +++ b/tests/phpunit/includes/content/WikitextStructureTest.php @@ -49,6 +49,19 @@ END; $this->assertContains( "Wikitext in Heading and also html", $headings ); } + public function testDefaultSort() { + $text = <<getStructure( $text ); + $this->assertEquals( "Michel, Louise", $struct->getDefaultSort() ); + } + public function testHeadingsFirst() { $text = <<profiler = new ProfilerStub( [] ); + $this->trxProfiler = new TransactionProfiler(); + $this->cliMode = true; + $this->connLogger = new \Psr\Log\NullLogger(); + $this->queryLogger = new \Psr\Log\NullLogger(); + $this->errorLogger = function ( Exception $e ) { + wfWarn( get_class( $e ) . ": {$e->getMessage()}" ); + }; + $this->currentDomain = DatabaseDomain::newUnspecified(); } protected function closeConnection() { @@ -80,7 +89,6 @@ class FakeDatabaseMysqlBase extends DatabaseMysqlBase { } - // From interface DatabaseType function insertId() { } @@ -167,22 +175,14 @@ class DatabaseMysqlBaseTest extends MediaWikiTestCase { ->setMethods( [ 'fetchRow', 'query' ] ) ->getMock(); - $db->expects( $this->any() ) - ->method( 'query' ) + $db->method( 'query' ) ->with( $this->anything() ) - ->will( - $this->returnValue( null ) - ); + ->willReturn( new FakeResultWrapper( [ + (object)[ 'Tables_in_' => 'view1' ], + (object)[ 'Tables_in_' => 'view2' ], + (object)[ 'Tables_in_' => 'myview' ] + ] ) ); - $db->expects( $this->any() ) - ->method( 'fetchRow' ) - ->with( $this->anything() ) - ->will( $this->onConsecutiveCalls( - [ 'Tables_in_' => 'view1' ], - [ 'Tables_in_' => 'view2' ], - [ 'Tables_in_' => 'myview' ], - false # no more rows - ) ); return $db; } /** @@ -191,9 +191,6 @@ class DatabaseMysqlBaseTest extends MediaWikiTestCase { function testListviews() { $db = $this->getMockForViews(); - // The first call populate an internal cache of views - $this->assertEquals( [ 'view1', 'view2', 'myview' ], - $db->listViews() ); $this->assertEquals( [ 'view1', 'view2', 'myview' ], $db->listViews() ); @@ -208,42 +205,6 @@ class DatabaseMysqlBaseTest extends MediaWikiTestCase { $db->listViews( '' ) ); } - /** - * @covers DatabaseMysqlBase::isView - * @dataProvider provideViewExistanceChecks - */ - function testIsView( $isView, $viewName ) { - $db = $this->getMockForViews(); - - switch ( $isView ) { - case true: - $this->assertTrue( $db->isView( $viewName ), - "$viewName should be considered a view" ); - break; - - case false: - $this->assertFalse( $db->isView( $viewName ), - "$viewName has not been defined as a view" ); - break; - } - - } - - function provideViewExistanceChecks() { - return [ - // format: whether it is a view, view name - [ true, 'view1' ], - [ true, 'view2' ], - [ true, 'myview' ], - - [ false, 'user' ], - - [ false, 'view10' ], - [ false, 'my' ], - [ false, 'OH_MY_GOD' ], # they killed kenny! - ]; - } - /** * @dataProvider provideComparePositions */ @@ -359,13 +320,11 @@ class DatabaseMysqlBaseTest extends MediaWikiTestCase { 'getLagDetectionMethod', 'getHeartbeatData', 'getMasterServerInfo' ] ) ->getMock(); - $db->expects( $this->any() ) - ->method( 'getLagDetectionMethod' ) - ->will( $this->returnValue( 'pt-heartbeat' ) ); + $db->method( 'getLagDetectionMethod' ) + ->willReturn( 'pt-heartbeat' ); - $db->expects( $this->any() ) - ->method( 'getMasterServerInfo' ) - ->will( $this->returnValue( [ 'serverId' => 172, 'asOf' => time() ] ) ); + $db->method( 'getMasterServerInfo' ) + ->willReturn( [ 'serverId' => 172, 'asOf' => time() ] ); // Fake the current time. list( $nowSecFrac, $nowSec ) = explode( ' ', microtime() ); @@ -379,10 +338,9 @@ class DatabaseMysqlBaseTest extends MediaWikiTestCase { $ptTimeISO = $ptDateTime->format( 'Y-m-d\TH:i:s' ); $ptTimeISO .= ltrim( number_format( $ptSecFrac, 6 ), '0' ); - $db->expects( $this->any() ) - ->method( 'getHeartbeatData' ) + $db->method( 'getHeartbeatData' ) ->with( [ 'server_id' => 172 ] ) - ->will( $this->returnValue( [ $ptTimeISO, $now ] ) ); + ->willReturn( [ $ptTimeISO, $now ] ); $db->setLBInfo( 'clusterMasterHost', 'db1052' ); $lagEst = $db->getLag(); diff --git a/tests/phpunit/includes/db/DatabaseSQLTest.php b/tests/phpunit/includes/db/DatabaseSQLTest.php index 5d5521ccfe..656e661690 100644 --- a/tests/phpunit/includes/db/DatabaseSQLTest.php +++ b/tests/phpunit/includes/db/DatabaseSQLTest.php @@ -5,15 +5,12 @@ * This is a non DBMS depending test. */ class DatabaseSQLTest extends MediaWikiTestCase { - - /** - * @var DatabaseTestHelper - */ + /** @var DatabaseTestHelper */ private $database; protected function setUp() { parent::setUp(); - $this->database = new DatabaseTestHelper( __CLASS__ ); + $this->database = new DatabaseTestHelper( __CLASS__, [ 'cliMode' => true ] ); } protected function assertLastSql( $sqlText ) { @@ -23,9 +20,13 @@ class DatabaseSQLTest extends MediaWikiTestCase { ); } + protected function assertLastSqlDb( $sqlText, $db ) { + $this->assertEquals( $db->getLastSqls(), $sqlText ); + } + /** * @dataProvider provideSelect - * @covers DatabaseBase::select + * @covers Database::select */ public function testSelect( $sql, $sqlText ) { $this->database->select( @@ -131,7 +132,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideUpdate - * @covers DatabaseBase::update + * @covers Database::update */ public function testUpdate( $sql, $sqlText ) { $this->database->update( @@ -183,7 +184,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideDelete - * @covers DatabaseBase::delete + * @covers Database::delete */ public function testDelete( $sql, $sqlText ) { $this->database->delete( @@ -216,7 +217,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideUpsert - * @covers DatabaseBase::upsert + * @covers Database::upsert */ public function testUpsert( $sql, $sqlText ) { $this->database->upsert( @@ -252,7 +253,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideDeleteJoin - * @covers DatabaseBase::deleteJoin + * @covers Database::deleteJoin */ public function testDeleteJoin( $sql, $sqlText ) { $this->database->deleteJoin( @@ -299,7 +300,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideInsert - * @covers DatabaseBase::insert + * @covers Database::insert */ public function testInsert( $sql, $sqlText ) { $this->database->insert( @@ -352,9 +353,9 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideInsertSelect - * @covers DatabaseBase::insertSelect + * @covers Database::insertSelect */ - public function testInsertSelect( $sql, $sqlText ) { + public function testInsertSelect( $sql, $sqlTextNative, $sqlSelect, $sqlInsert ) { $this->database->insertSelect( $sql['destTable'], $sql['srcTable'], @@ -364,7 +365,22 @@ class DatabaseSQLTest extends MediaWikiTestCase { isset( $sql['insertOptions'] ) ? $sql['insertOptions'] : [], isset( $sql['selectOptions'] ) ? $sql['selectOptions'] : [] ); - $this->assertLastSql( $sqlText ); + $this->assertLastSql( $sqlTextNative ); + + $dbWeb = new DatabaseTestHelper( __CLASS__, [ 'cliMode' => false ] ); + $dbWeb->forceNextResult( [ + array_flip( array_keys( $sql['varMap'] ) ) + ] ); + $dbWeb->insertSelect( + $sql['destTable'], + $sql['srcTable'], + $sql['varMap'], + $sql['conds'], + __METHOD__, + isset( $sql['insertOptions'] ) ? $sql['insertOptions'] : [], + isset( $sql['selectOptions'] ) ? $sql['selectOptions'] : [] + ); + $this->assertLastSqlDb( implode( '; ', [ $sqlSelect, $sqlInsert ] ), $dbWeb ); } public static function provideInsertSelect() { @@ -379,7 +395,10 @@ class DatabaseSQLTest extends MediaWikiTestCase { "INSERT INTO insert_table " . "(field_insert,field) " . "SELECT field_select,field2 " . - "FROM select_table" + "FROM select_table", + "SELECT field_select AS field_insert,field2 AS field " . + "FROM select_table WHERE * FOR UPDATE", + "INSERT INTO insert_table (field_insert,field) VALUES ('0','1')" ], [ [ @@ -392,7 +411,10 @@ class DatabaseSQLTest extends MediaWikiTestCase { "(field_insert,field) " . "SELECT field_select,field2 " . "FROM select_table " . - "WHERE field = '2'" + "WHERE field = '2'", + "SELECT field_select AS field_insert,field2 AS field FROM " . + "select_table WHERE field = '2' FOR UPDATE", + "INSERT INTO insert_table (field_insert,field) VALUES ('0','1')" ], [ [ @@ -408,14 +430,17 @@ class DatabaseSQLTest extends MediaWikiTestCase { "SELECT field_select,field2 " . "FROM select_table " . "WHERE field = '2' " . - "ORDER BY field" + "ORDER BY field", + "SELECT field_select AS field_insert,field2 AS field " . + "FROM select_table WHERE field = '2' ORDER BY field FOR UPDATE", + "INSERT IGNORE INTO insert_table (field_insert,field) VALUES ('0','1')" ], ]; } /** * @dataProvider provideReplace - * @covers DatabaseBase::replace + * @covers Database::replace */ public function testReplace( $sql, $sqlText ) { $this->database->replace( @@ -530,7 +555,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideNativeReplace - * @covers DatabaseBase::nativeReplace + * @covers Database::nativeReplace */ public function testNativeReplace( $sql, $sqlText ) { $this->database->nativeReplace( @@ -557,7 +582,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideConditional - * @covers DatabaseBase::conditional + * @covers Database::conditional */ public function testConditional( $sql, $sqlText ) { $this->assertEquals( trim( $this->database->conditional( @@ -598,7 +623,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideBuildConcat - * @covers DatabaseBase::buildConcat + * @covers Database::buildConcat */ public function testBuildConcat( $stringList, $sqlText ) { $this->assertEquals( trim( $this->database->buildConcat( @@ -621,7 +646,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideBuildLike - * @covers DatabaseBase::buildLike + * @covers Database::buildLike */ public function testBuildLike( $array, $sqlText ) { $this->assertEquals( trim( $this->database->buildLike( @@ -652,7 +677,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideUnionQueries - * @covers DatabaseBase::unionQueries + * @covers Database::unionQueries */ public function testUnionQueries( $sql, $sqlText ) { $this->assertEquals( trim( $this->database->unionQueries( @@ -688,7 +713,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { } /** - * @covers DatabaseBase::commit + * @covers Database::commit */ public function testTransactionCommit() { $this->database->begin( __METHOD__ ); @@ -697,7 +722,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { } /** - * @covers DatabaseBase::rollback + * @covers Database::rollback */ public function testTransactionRollback() { $this->database->begin( __METHOD__ ); @@ -706,16 +731,16 @@ class DatabaseSQLTest extends MediaWikiTestCase { } /** - * @covers DatabaseBase::dropTable + * @covers Database::dropTable */ public function testDropTable() { $this->database->setExistingTables( [ 'table' ] ); $this->database->dropTable( 'table', __METHOD__ ); - $this->assertLastSql( 'DROP TABLE table' ); + $this->assertLastSql( 'DROP TABLE table CASCADE' ); } /** - * @covers DatabaseBase::dropTable + * @covers Database::dropTable */ public function testDropNonExistingTable() { $this->assertFalse( @@ -725,7 +750,7 @@ class DatabaseSQLTest extends MediaWikiTestCase { /** * @dataProvider provideMakeList - * @covers DatabaseBase::makeList + * @covers Database::makeList */ public function testMakeList( $list, $mode, $sqlText ) { $this->assertEquals( trim( $this->database->makeList( @@ -802,4 +827,42 @@ class DatabaseSQLTest extends MediaWikiTestCase { ], ]; } + + public function testSessionTempTables() { + $temp1 = $this->database->tableName( 'tmp_table_1' ); + $temp2 = $this->database->tableName( 'tmp_table_2' ); + $temp3 = $this->database->tableName( 'tmp_table_3' ); + + $this->database->query( "CREATE TEMPORARY TABLE $temp1 LIKE orig_tbl", __METHOD__ ); + $this->database->query( "CREATE TEMPORARY TABLE $temp2 LIKE orig_tbl", __METHOD__ ); + $this->database->query( "CREATE TEMPORARY TABLE $temp3 LIKE orig_tbl", __METHOD__ ); + + $this->assertTrue( $this->database->tableExists( "tmp_table_1", __METHOD__ ) ); + $this->assertTrue( $this->database->tableExists( "tmp_table_2", __METHOD__ ) ); + $this->assertTrue( $this->database->tableExists( "tmp_table_3", __METHOD__ ) ); + + $this->database->dropTable( 'tmp_table_1', __METHOD__ ); + $this->database->dropTable( 'tmp_table_2', __METHOD__ ); + $this->database->dropTable( 'tmp_table_3', __METHOD__ ); + + $this->assertFalse( $this->database->tableExists( "tmp_table_1", __METHOD__ ) ); + $this->assertFalse( $this->database->tableExists( "tmp_table_2", __METHOD__ ) ); + $this->assertFalse( $this->database->tableExists( "tmp_table_3", __METHOD__ ) ); + + $this->database->query( "CREATE TEMPORARY TABLE tmp_table_1 LIKE orig_tbl", __METHOD__ ); + $this->database->query( "CREATE TEMPORARY TABLE 'tmp_table_2' LIKE orig_tbl", __METHOD__ ); + $this->database->query( "CREATE TEMPORARY TABLE `tmp_table_3` LIKE orig_tbl", __METHOD__ ); + + $this->assertTrue( $this->database->tableExists( "tmp_table_1", __METHOD__ ) ); + $this->assertTrue( $this->database->tableExists( "tmp_table_2", __METHOD__ ) ); + $this->assertTrue( $this->database->tableExists( "tmp_table_3", __METHOD__ ) ); + + $this->database->query( "DROP TEMPORARY TABLE tmp_table_1 LIKE orig_tbl", __METHOD__ ); + $this->database->query( "DROP TEMPORARY TABLE 'tmp_table_2' LIKE orig_tbl", __METHOD__ ); + $this->database->query( "DROP TABLE `tmp_table_3` LIKE orig_tbl", __METHOD__ ); + + $this->assertFalse( $this->database->tableExists( "tmp_table_1", __METHOD__ ) ); + $this->assertFalse( $this->database->tableExists( "tmp_table_2", __METHOD__ ) ); + $this->assertFalse( $this->database->tableExists( "tmp_table_3", __METHOD__ ) ); + } } diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php index 80fb826bf3..172d68650d 100644 --- a/tests/phpunit/includes/db/DatabaseSqliteTest.php +++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php @@ -7,7 +7,7 @@ class DatabaseSqliteMock extends DatabaseSqlite { $p['dbFilePath'] = ':memory:'; $p['schema'] = false; - return DatabaseBase::factory( 'SqliteMock', $p ); + return Database::factory( 'SqliteMock', $p ); } function query( $sql, $fname = '', $tempIgnore = false ) { diff --git a/tests/phpunit/includes/db/DatabaseTest.php b/tests/phpunit/includes/db/DatabaseTest.php index 07514092de..606a20989c 100644 --- a/tests/phpunit/includes/db/DatabaseTest.php +++ b/tests/phpunit/includes/db/DatabaseTest.php @@ -2,11 +2,11 @@ /** * @group Database - * @group DatabaseBase + * @group Database */ class DatabaseTest extends MediaWikiTestCase { /** - * @var DatabaseBase + * @var Database */ protected $db; @@ -25,8 +25,9 @@ class DatabaseTest extends MediaWikiTestCase { } $this->db->restoreFlags( IDatabase::RESTORE_INITIAL ); } + /** - * @covers DatabaseBase::dropTable + * @covers Database::dropTable */ public function testAddQuotesNull() { $check = "NULL"; @@ -68,21 +69,26 @@ class DatabaseTest extends MediaWikiTestCase { } private function getSharedTableName( $table, $database, $prefix, $format = 'quoted' ) { - global $wgSharedDB, $wgSharedTables, $wgSharedPrefix; - - $oldName = $wgSharedDB; - $oldTables = $wgSharedTables; - $oldPrefix = $wgSharedPrefix; + global $wgSharedDB, $wgSharedTables, $wgSharedPrefix, $wgSharedSchema; - $wgSharedDB = $database; - $wgSharedTables = [ $table ]; - $wgSharedPrefix = $prefix; + $this->db->setTableAliases( [ + $table => [ + 'dbname' => $database, + 'schema' => null, + 'prefix' => $prefix + ] + ] ); $ret = $this->db->tableName( $table, $format ); - $wgSharedDB = $oldName; - $wgSharedTables = $oldTables; - $wgSharedPrefix = $oldPrefix; + $this->db->setTableAliases( array_fill_keys( + $wgSharedDB ? $wgSharedTables : [], + [ + 'dbname' => $wgSharedDB, + 'schema' => $wgSharedSchema, + 'prefix' => $wgSharedPrefix + ] + ) ); return $ret; } @@ -169,47 +175,6 @@ class DatabaseTest extends MediaWikiTestCase { ); } - public function testFillPreparedEmpty() { - $sql = $this->db->fillPrepared( - 'SELECT * FROM interwiki', [] ); - $this->assertEquals( - "SELECT * FROM interwiki", - $sql ); - } - - public function testFillPreparedQuestion() { - $sql = $this->db->fillPrepared( - 'SELECT * FROM cur WHERE cur_namespace=? AND cur_title=?', - [ 4, "Snicker's_paradox" ] ); - - $check = "SELECT * FROM cur WHERE cur_namespace='4' AND cur_title='Snicker''s_paradox'"; - if ( $this->db->getType() === 'mysql' ) { - $check = "SELECT * FROM cur WHERE cur_namespace='4' AND cur_title='Snicker\'s_paradox'"; - } - $this->assertEquals( $check, $sql ); - } - - public function testFillPreparedBang() { - $sql = $this->db->fillPrepared( - 'SELECT user_id FROM ! WHERE user_name=?', - [ '"user"', "Slash's Dot" ] ); - - $check = "SELECT user_id FROM \"user\" WHERE user_name='Slash''s Dot'"; - if ( $this->db->getType() === 'mysql' ) { - $check = "SELECT user_id FROM \"user\" WHERE user_name='Slash\'s Dot'"; - } - $this->assertEquals( $check, $sql ); - } - - public function testFillPreparedRaw() { - $sql = $this->db->fillPrepared( - "SELECT * FROM cur WHERE cur_title='This_\\&_that,_WTF\\?\\!'", - [ '"user"', "Slash's Dot" ] ); - $this->assertEquals( - "SELECT * FROM cur WHERE cur_title='This_&_that,_WTF?!'", - $sql ); - } - public function testStoredFunctions() { if ( !in_array( wfGetDB( DB_MASTER )->getType(), [ 'mysql', 'postgres' ] ) ) { $this->markTestSkipped( 'MySQL or Postgres required' ); @@ -226,7 +191,7 @@ class DatabaseTest extends MediaWikiTestCase { private function dropFunctions() { $this->db->query( 'DROP FUNCTION IF EXISTS mw_test_function' - . ( $this->db->getType() == 'postgres' ? '()' : '' ) + . ( $this->db->getType() == 'postgres' ? '()' : '' ) ); } @@ -242,26 +207,35 @@ class DatabaseTest extends MediaWikiTestCase { $db->setFlag( DBO_TRX ); $called = false; $flagSet = null; - $db->onTransactionIdle( function() use ( $db, &$flagSet, &$called ) { - $called = true; - $flagSet = $db->getFlag( DBO_TRX ); - } ); + $db->onTransactionIdle( + function () use ( $db, &$flagSet, &$called ) { + $called = true; + $flagSet = $db->getFlag( DBO_TRX ); + }, + __METHOD__ + ); $this->assertFalse( $flagSet, 'DBO_TRX off in callback' ); $this->assertTrue( $db->getFlag( DBO_TRX ), 'DBO_TRX restored to default' ); $this->assertTrue( $called, 'Callback reached' ); $db->clearFlag( DBO_TRX ); $flagSet = null; - $db->onTransactionIdle( function() use ( $db, &$flagSet ) { - $flagSet = $db->getFlag( DBO_TRX ); - } ); + $db->onTransactionIdle( + function () use ( $db, &$flagSet ) { + $flagSet = $db->getFlag( DBO_TRX ); + }, + __METHOD__ + ); $this->assertFalse( $flagSet, 'DBO_TRX off in callback' ); $this->assertFalse( $db->getFlag( DBO_TRX ), 'DBO_TRX restored to default' ); $db->clearFlag( DBO_TRX ); - $db->onTransactionIdle( function() use ( $db ) { - $db->setFlag( DBO_TRX ); - } ); + $db->onTransactionIdle( + function () use ( $db ) { + $db->setFlag( DBO_TRX ); + }, + __METHOD__ + ); $this->assertFalse( $db->getFlag( DBO_TRX ), 'DBO_TRX restored to default' ); } @@ -271,7 +245,7 @@ class DatabaseTest extends MediaWikiTestCase { $db->clearFlag( DBO_TRX ); $db->begin( __METHOD__ ); $called = false; - $db->onTransactionResolution( function() use ( $db, &$called ) { + $db->onTransactionResolution( function () use ( $db, &$called ) { $called = true; $db->setFlag( DBO_TRX ); } ); @@ -282,7 +256,7 @@ class DatabaseTest extends MediaWikiTestCase { $db->clearFlag( DBO_TRX ); $db->begin( __METHOD__ ); $called = false; - $db->onTransactionResolution( function() use ( $db, &$called ) { + $db->onTransactionResolution( function () use ( $db, &$called ) { $called = true; $db->setFlag( DBO_TRX ); } ); @@ -291,6 +265,56 @@ class DatabaseTest extends MediaWikiTestCase { $this->assertTrue( $called, 'Callback reached' ); } + /** + * @covers Database::setTransactionListener() + */ + public function testTransactionListener() { + $db = $this->db; + + $db->setTransactionListener( 'ping', function () use ( $db, &$called ) { + $called = true; + } ); + + $called = false; + $db->begin( __METHOD__ ); + $db->commit( __METHOD__ ); + $this->assertTrue( $called, 'Callback reached' ); + + $called = false; + $db->begin( __METHOD__ ); + $db->commit( __METHOD__ ); + $this->assertTrue( $called, 'Callback still reached' ); + + $called = false; + $db->begin( __METHOD__ ); + $db->rollback( __METHOD__ ); + $this->assertTrue( $called, 'Callback reached' ); + + $db->setTransactionListener( 'ping', null ); + $called = false; + $db->begin( __METHOD__ ); + $db->commit( __METHOD__ ); + $this->assertFalse( $called, 'Callback not reached' ); + } + + /** + * @covers Database::flushSnapshot() + */ + public function testFlushSnapshot() { + $db = $this->db; + + $db->flushSnapshot( __METHOD__ ); // ok + $db->flushSnapshot( __METHOD__ ); // ok + + $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR ); + $db->query( 'SELECT 1', __METHOD__ ); + $this->assertTrue( (bool)$db->trxLevel(), "Transaction started." ); + $db->flushSnapshot( __METHOD__ ); // ok + $db->restoreFlags( $db::RESTORE_PRIOR ); + + $this->assertFalse( (bool)$db->trxLevel(), "Transaction cleared." ); + } + public function testGetScopedLock() { $db = $this->db; @@ -326,33 +350,35 @@ class DatabaseTest extends MediaWikiTestCase { } /** - * @covers DatabaseBase::getFlag( - * @covers DatabaseBase::setFlag() - * @covers DatabaseBase::restoreFlags() + * @covers Database::getFlag( + * @covers Database::setFlag() + * @covers Database::restoreFlags() */ public function testFlagSetting() { $db = $this->db; $origTrx = $db->getFlag( DBO_TRX ); $origSsl = $db->getFlag( DBO_SSL ); - if ( $origTrx ) { - $db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR ); - } else { - $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR ); - } + $origTrx + ? $db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR ) + : $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR ); $this->assertEquals( !$origTrx, $db->getFlag( DBO_TRX ) ); - if ( $origSsl ) { - $db->clearFlag( DBO_SSL, $db::REMEMBER_PRIOR ); - } else { - $db->setFlag( DBO_SSL, $db::REMEMBER_PRIOR ); - } + $origSsl + ? $db->clearFlag( DBO_SSL, $db::REMEMBER_PRIOR ) + : $db->setFlag( DBO_SSL, $db::REMEMBER_PRIOR ); $this->assertEquals( !$origSsl, $db->getFlag( DBO_SSL ) ); - $db2 = clone $db; - $db2->restoreFlags( $db::RESTORE_INITIAL ); - $this->assertEquals( $origTrx, $db2->getFlag( DBO_TRX ) ); - $this->assertEquals( $origSsl, $db2->getFlag( DBO_SSL ) ); + $db->restoreFlags( $db::RESTORE_INITIAL ); + $this->assertEquals( $origTrx, $db->getFlag( DBO_TRX ) ); + $this->assertEquals( $origSsl, $db->getFlag( DBO_SSL ) ); + + $origTrx + ? $db->clearFlag( DBO_TRX, $db::REMEMBER_PRIOR ) + : $db->setFlag( DBO_TRX, $db::REMEMBER_PRIOR ); + $origSsl + ? $db->clearFlag( DBO_SSL, $db::REMEMBER_PRIOR ) + : $db->setFlag( DBO_SSL, $db::REMEMBER_PRIOR ); $db->restoreFlags(); $this->assertEquals( $origSsl, $db->getFlag( DBO_SSL ) ); @@ -362,4 +388,26 @@ class DatabaseTest extends MediaWikiTestCase { $this->assertEquals( $origSsl, $db->getFlag( DBO_SSL ) ); $this->assertEquals( $origTrx, $db->getFlag( DBO_TRX ) ); } + + /** + * @covers Database::tablePrefix() + * @covers Database::dbSchema() + */ + public function testMutators() { + $old = $this->db->tablePrefix(); + $this->assertType( 'string', $old, 'Prefix is string' ); + $this->assertEquals( $old, $this->db->tablePrefix(), "Prefix unchanged" ); + $this->assertEquals( $old, $this->db->tablePrefix( 'xxx' ) ); + $this->assertEquals( 'xxx', $this->db->tablePrefix(), "Prefix set" ); + $this->db->tablePrefix( $old ); + $this->assertNotEquals( 'xxx', $this->db->tablePrefix() ); + + $old = $this->db->dbSchema(); + $this->assertType( 'string', $old, 'Schema is string' ); + $this->assertEquals( $old, $this->db->dbSchema(), "Schema unchanged" ); + $this->assertEquals( $old, $this->db->dbSchema( 'xxx' ) ); + $this->assertEquals( 'xxx', $this->db->dbSchema(), "Schema set" ); + $this->db->dbSchema( $old ); + $this->assertNotEquals( 'xxx', $this->db->dbSchema() ); + } } diff --git a/tests/phpunit/includes/db/DatabaseTestHelper.php b/tests/phpunit/includes/db/DatabaseTestHelper.php index aa8b8e8f0f..c5603c4093 100644 --- a/tests/phpunit/includes/db/DatabaseTestHelper.php +++ b/tests/phpunit/includes/db/DatabaseTestHelper.php @@ -1,10 +1,10 @@ testName = $testName; + + $this->profiler = new ProfilerStub( [] ); + $this->trxProfiler = new TransactionProfiler(); + $this->cliMode = isset( $opts['cliMode'] ) ? $opts['cliMode'] : true; + $this->connLogger = new \Psr\Log\NullLogger(); + $this->queryLogger = new \Psr\Log\NullLogger(); + $this->errorLogger = function ( Exception $e ) { + wfWarn( get_class( $e ) . ": {$e->getMessage()}" ); + }; + $this->currentDomain = DatabaseDomain::newUnspecified(); } /** @@ -44,6 +57,13 @@ class DatabaseTestHelper extends DatabaseBase { $this->tablesExists = (array)$tablesExists; } + /** + * @param mixed $res Use an array of row arrays to set row result + */ + public function forceNextResult( $res ) { + $this->nextResult = $res; + } + protected function addSql( $sql ) { // clean up spaces before and after some words and the whole string $this->lastSqls[] = trim( preg_replace( @@ -78,6 +98,11 @@ class DatabaseTestHelper extends DatabaseBase { } public function tableExists( $table, $fname = __METHOD__ ) { + $tableRaw = $this->tableName( $table, 'raw' ); + if ( isset( $this->mSessionTempTables[$tableRaw] ) ) { + return true; // already known to exist + } + $this->checkFunctionName( $fname ); return in_array( $table, (array)$this->tablesExists ); @@ -136,7 +161,7 @@ class DatabaseTestHelper extends DatabaseBase { return false; } - function indexInfo( $table, $index, $fname = 'DatabaseBase::indexInfo' ) { + function indexInfo( $table, $index, $fname = 'Database::indexInfo' ) { return false; } @@ -160,11 +185,19 @@ class DatabaseTestHelper extends DatabaseBase { return true; } + function ping( &$rtt = null ) { + $rtt = 0.0; + return true; + } + protected function closeConnection() { return false; } protected function doQuery( $sql ) { - return []; + $res = $this->nextResult; + $this->nextResult = []; + + return new FakeResultWrapper( $res ); } } diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php index 3562ed822a..d8773f8ad2 100644 --- a/tests/phpunit/includes/db/LBFactoryTest.php +++ b/tests/phpunit/includes/db/LBFactoryTest.php @@ -43,7 +43,7 @@ class LBFactoryTest extends MediaWikiTestCase { ]; $this->hideDeprecated( '$wgLBFactoryConf must be updated. See RELEASE-NOTES for details' ); - $result = LBFactory::getLBFactoryClass( $config ); + $result = MWLBFactory::getLBFactoryClass( $config ); $this->assertEquals( $expected, $result ); } @@ -54,14 +54,26 @@ class LBFactoryTest extends MediaWikiTestCase { [ 'LBFactorySimple', 'LBFactory_Simple' ], [ 'LBFactorySingle', 'LBFactory_Single' ], [ 'LBFactoryMulti', 'LBFactory_Multi' ], - [ 'LBFactoryFake', 'LBFactory_Fake' ], ]; } public function testLBFactorySimpleServer() { - $this->setMwGlobals( 'wgDBservers', false ); + global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir; - $factory = new LBFactorySimple( [] ); + $servers = [ + [ + 'host' => $wgDBserver, + 'dbname' => $wgDBname, + 'user' => $wgDBuser, + 'password' => $wgDBpassword, + 'type' => $wgDBtype, + 'dbDirectory' => $wgSQLiteDataDir, + 'load' => 0, + 'flags' => DBO_TRX // REPEATABLE-READ for consistency + ], + ]; + + $factory = new LBFactorySimple( [ 'servers' => $servers ] ); $lb = $factory->getMainLB(); $dbw = $lb->getConnection( DB_MASTER ); @@ -75,48 +87,57 @@ class LBFactoryTest extends MediaWikiTestCase { } public function testLBFactorySimpleServers() { - global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype; + global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir; - $this->setMwGlobals( 'wgDBservers', [ + $servers = [ [ // master - 'host' => $wgDBserver, - 'dbname' => $wgDBname, - 'user' => $wgDBuser, - 'password' => $wgDBpassword, - 'type' => $wgDBtype, - 'load' => 0, - 'flags' => DBO_TRX // REPEATABLE-READ for consistency + 'host' => $wgDBserver, + 'dbname' => $wgDBname, + 'user' => $wgDBuser, + 'password' => $wgDBpassword, + 'type' => $wgDBtype, + 'dbDirectory' => $wgSQLiteDataDir, + 'load' => 0, + 'flags' => DBO_TRX // REPEATABLE-READ for consistency ], [ // emulated slave - 'host' => $wgDBserver, - 'dbname' => $wgDBname, - 'user' => $wgDBuser, - 'password' => $wgDBpassword, - 'type' => $wgDBtype, - 'load' => 100, - 'flags' => DBO_TRX // REPEATABLE-READ for consistency + 'host' => $wgDBserver, + 'dbname' => $wgDBname, + 'user' => $wgDBuser, + 'password' => $wgDBpassword, + 'type' => $wgDBtype, + 'dbDirectory' => $wgSQLiteDataDir, + 'load' => 100, + 'flags' => DBO_TRX // REPEATABLE-READ for consistency ] - ] ); + ]; - $factory = new LBFactorySimple( [ 'loadMonitorClass' => 'LoadMonitorNull' ] ); + $factory = new LBFactorySimple( [ + 'servers' => $servers, + 'loadMonitorClass' => 'LoadMonitorNull' + ] ); $lb = $factory->getMainLB(); $dbw = $lb->getConnection( DB_MASTER ); $this->assertTrue( $dbw->getLBInfo( 'master' ), 'master shows as master' ); $this->assertEquals( - $wgDBserver, $dbw->getLBInfo( 'clusterMasterHost' ), 'cluster master set' ); + ( $wgDBserver != '' ) ? $wgDBserver : 'localhost', + $dbw->getLBInfo( 'clusterMasterHost' ), + 'cluster master set' ); $dbr = $lb->getConnection( DB_SLAVE ); - $this->assertTrue( $dbr->getLBInfo( 'slave' ), 'slave shows as slave' ); + $this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' ); $this->assertEquals( - $wgDBserver, $dbr->getLBInfo( 'clusterMasterHost' ), 'cluster master set' ); + ( $wgDBserver != '' ) ? $wgDBserver : 'localhost', + $dbr->getLBInfo( 'clusterMasterHost' ), + 'cluster master set' ); $factory->shutdown(); $lb->closeAll(); } public function testLBFactoryMulti() { - global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype; + global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir; $factory = new LBFactoryMulti( [ 'sectionsByDB' => [], @@ -131,6 +152,7 @@ class LBFactoryTest extends MediaWikiTestCase { 'user' => $wgDBuser, 'password' => $wgDBpassword, 'type' => $wgDBtype, + 'dbDirectory' => $wgSQLiteDataDir, 'flags' => DBO_DEFAULT ], 'hostsByName' => [ @@ -145,7 +167,7 @@ class LBFactoryTest extends MediaWikiTestCase { $this->assertTrue( $dbw->getLBInfo( 'master' ), 'master shows as master' ); $dbr = $lb->getConnection( DB_SLAVE ); - $this->assertTrue( $dbr->getLBInfo( 'slave' ), 'slave shows as slave' ); + $this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' ); $factory->shutdown(); $lb->closeAll(); @@ -155,25 +177,31 @@ class LBFactoryTest extends MediaWikiTestCase { // (a) First HTTP request $mPos = new MySQLMasterPos( 'db1034-bin.000976', '843431247' ); + $now = microtime( true ); $mockDB = $this->getMockBuilder( 'DatabaseMysql' ) ->disableOriginalConstructor() ->getMock(); - $mockDB->expects( $this->any() ) - ->method( 'doneWrites' )->will( $this->returnValue( true ) ); - $mockDB->expects( $this->any() ) - ->method( 'getMasterPos' )->will( $this->returnValue( $mPos ) ); + $mockDB->method( 'writesOrCallbacksPending' )->willReturn( true ); + $mockDB->method( 'lastDoneWrites' )->willReturn( $now ); + $mockDB->method( 'getMasterPos' )->willReturn( $mPos ); $lb = $this->getMockBuilder( 'LoadBalancer' ) ->disableOriginalConstructor() ->getMock(); - $lb->expects( $this->any() ) - ->method( 'getConnection' )->will( $this->returnValue( $mockDB ) ); - $lb->expects( $this->any() ) - ->method( 'getServerCount' )->will( $this->returnValue( 2 ) ); - $lb->expects( $this->any() ) - ->method( 'parentInfo' )->will( $this->returnValue( [ 'id' => "main-DEFAULT" ] ) ); - $lb->expects( $this->any() ) - ->method( 'getAnyOpenConnection' )->will( $this->returnValue( $mockDB ) ); + $lb->method( 'getConnection' )->willReturn( $mockDB ); + $lb->method( 'getServerCount' )->willReturn( 2 ); + $lb->method( 'parentInfo' )->willReturn( [ 'id' => "main-DEFAULT" ] ); + $lb->method( 'getAnyOpenConnection' )->willReturn( $mockDB ); + $lb->method( 'hasOrMadeRecentMasterChanges' )->will( $this->returnCallback( + function () use ( $mockDB ) { + $p = 0; + $p |= call_user_func( [ $mockDB, 'writesOrCallbacksPending' ] ); + $p |= call_user_func( [ $mockDB, 'lastDoneWrites' ] ); + + return (bool)$p; + } + ) ); + $lb->method( 'getMasterPos' )->willReturn( $mPos ); $bag = new HashBagOStuff(); $cp = new ChronologyProtector( @@ -184,7 +212,8 @@ class LBFactoryTest extends MediaWikiTestCase { ] ); - $mockDB->expects( $this->exactly( 2 ) )->method( 'doneWrites' ); + $mockDB->expects( $this->exactly( 2 ) )->method( 'writesOrCallbacksPending' ); + $mockDB->expects( $this->exactly( 2 ) )->method( 'lastDoneWrites' ); // Nothing to wait for $cp->initLB( $lb ); @@ -210,4 +239,186 @@ class LBFactoryTest extends MediaWikiTestCase { $cp->shutdownLB( $lb ); $cp->shutdown(); } + + private function newLBFactoryMulti( array $baseOverride = [], array $serverOverride = [] ) { + global $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, $wgDBtype, $wgSQLiteDataDir; + + return new LBFactoryMulti( $baseOverride + [ + 'sectionsByDB' => [], + 'sectionLoads' => [ + 'DEFAULT' => [ + 'test-db1' => 1, + ], + ], + 'serverTemplate' => $serverOverride + [ + 'dbname' => $wgDBname, + 'user' => $wgDBuser, + 'password' => $wgDBpassword, + 'type' => $wgDBtype, + 'dbDirectory' => $wgSQLiteDataDir, + 'flags' => DBO_DEFAULT + ], + 'hostsByName' => [ + 'test-db1' => $wgDBserver, + ], + 'loadMonitorClass' => 'LoadMonitorNull', + 'localDomain' => wfWikiID() + ] ); + } + + public function testNiceDomains() { + global $wgDBname, $wgDBtype; + + if ( $wgDBtype === 'sqlite' ) { + $tmpDir = $this->getNewTempDirectory(); + $dbPath = "$tmpDir/unit_test_db.sqlite"; + file_put_contents( $dbPath, '' ); + $tempFsFile = new TempFSFile( $dbPath ); + $tempFsFile->autocollect(); + } else { + $dbPath = null; + } + + $factory = $this->newLBFactoryMulti( + [], + [ 'dbFilePath' => $dbPath ] + ); + $lb = $factory->getMainLB(); + + if ( $wgDBtype !== 'sqlite' ) { + $db = $lb->getConnectionRef( DB_MASTER ); + $this->assertEquals( + $wgDBname, + $db->getDomainID() + ); + unset( $db ); + } + + /** @var Database $db */ + $db = $lb->getConnection( DB_MASTER, [], '' ); + $lb->reuseConnection( $db ); // don't care + + $this->assertEquals( + '', + $db->getDomainID() + ); + + $this->assertEquals( + $this->quoteTable( $db, 'page' ), + $db->tableName( 'page' ), + "Correct full table name" + ); + + $this->assertEquals( + $this->quoteTable( $db, $wgDBname ) . '.' . $this->quoteTable( $db, 'page' ), + $db->tableName( "$wgDBname.page" ), + "Correct full table name" + ); + + $this->assertEquals( + $this->quoteTable( $db, 'nice_db' ) . '.' . $this->quoteTable( $db, 'page' ), + $db->tableName( 'nice_db.page' ), + "Correct full table name" + ); + + $factory->setDomainPrefix( 'my_' ); + $this->assertEquals( + '', + $db->getDomainID() + ); + $this->assertEquals( + $this->quoteTable( $db, 'my_page' ), + $db->tableName( 'page' ), + "Correct full table name" + ); + $this->assertEquals( + $this->quoteTable( $db, 'other_nice_db' ) . '.' . $this->quoteTable( $db, 'page' ), + $db->tableName( 'other_nice_db.page' ), + "Correct full table name" + ); + + $factory->closeAll(); + $factory->destroy(); + } + + public function testTrickyDomain() { + global $wgDBtype; + + if ( $wgDBtype === 'sqlite' ) { + $tmpDir = $this->getNewTempDirectory(); + $dbPath = "$tmpDir/unit_test_db.sqlite"; + file_put_contents( $dbPath, '' ); + $tempFsFile = new TempFSFile( $dbPath ); + $tempFsFile->autocollect(); + } else { + $dbPath = null; + } + + $dbname = 'unittest-domain'; + $factory = $this->newLBFactoryMulti( + [ 'localDomain' => $dbname ], + [ 'dbname' => $dbname, 'dbFilePath' => $dbPath ] + ); + $lb = $factory->getMainLB(); + /** @var Database $db */ + $db = $lb->getConnection( DB_MASTER, [], '' ); + $lb->reuseConnection( $db ); // don't care + + $this->assertEquals( + '', + $db->getDomainID() + ); + + $this->assertEquals( + $this->quoteTable( $db, 'page' ), + $db->tableName( 'page' ), + "Correct full table name" + ); + + $this->assertEquals( + $this->quoteTable( $db, $dbname ) . '.' . $this->quoteTable( $db, 'page' ), + $db->tableName( "$dbname.page" ), + "Correct full table name" + ); + + $this->assertEquals( + $this->quoteTable( $db, 'nice_db' ) . '.' . $this->quoteTable( $db, 'page' ), + $db->tableName( 'nice_db.page' ), + "Correct full table name" + ); + + $factory->setDomainPrefix( 'my_' ); + + $this->assertEquals( + $this->quoteTable( $db, 'my_page' ), + $db->tableName( 'page' ), + "Correct full table name" + ); + $this->assertEquals( + $this->quoteTable( $db, 'other_nice_db' ) . '.' . $this->quoteTable( $db, 'page' ), + $db->tableName( 'other_nice_db.page' ), + "Correct full table name" + ); + + \MediaWiki\suppressWarnings(); + $this->assertFalse( $db->selectDB( 'garbage-db' ) ); + \MediaWiki\restoreWarnings(); + + $this->assertEquals( + $this->quoteTable( $db, 'garbage-db' ) . '.' . $this->quoteTable( $db, 'page' ), + $db->tableName( 'garbage-db.page' ), + "Correct full table name" + ); + + $factory->closeAll(); + $factory->destroy(); + } + + private function quoteTable( Database $db, $table ) { + if ( $db->getType() === 'sqlite' ) { + return $table; + } else { + return $db->addIdentifierQuotes( $table ); + } + } } diff --git a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php index ecc67b73ef..4227693a2e 100644 --- a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php +++ b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php @@ -5,10 +5,15 @@ class DeferredUpdatesTest extends MediaWikiTestCase { $this->setMwGlobals( 'wgCommandLineMode', false ); $updates = [ - '1' => 'deferred update 1', - '2' => 'deferred update 2', - '3' => 'deferred update 3', - '2-1' => 'deferred update 1 within deferred update 2', + '1' => "deferred update 1;\n", + '2' => "deferred update 2;\n", + '2-1' => "deferred update 1 within deferred update 2;\n", + '2-2' => "deferred update 2 within deferred update 2;\n", + '3' => "deferred update 3;\n", + '3-1' => "deferred update 1 within deferred update 3;\n", + '3-2' => "deferred update 2 within deferred update 3;\n", + '3-1-1' => "deferred update 1 within deferred update 1 within deferred update 3;\n", + '3-2-1' => "deferred update 1 within deferred update 2 with deferred update 3;\n", ]; DeferredUpdates::addCallableUpdate( function () use ( $updates ) { @@ -23,14 +28,41 @@ class DeferredUpdatesTest extends MediaWikiTestCase { echo $updates['2-1']; } ); + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['2-2']; + } + ); } ); DeferredUpdates::addCallableUpdate( function () use ( $updates ) { - echo $updates[3]; + echo $updates['3']; + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['3-1']; + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['3-1-1']; + } + ); + } + ); + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['3-2']; + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['3-2-1']; + } + ); + } + ); } ); + $this->assertEquals( 3, DeferredUpdates::pendingUpdatesCount() ); + $this->expectOutputString( implode( '', $updates ) ); DeferredUpdates::doUpdates(); @@ -63,13 +95,20 @@ class DeferredUpdatesTest extends MediaWikiTestCase { public function testDoUpdatesCLI() { $this->setMwGlobals( 'wgCommandLineMode', true ); - $updates = [ - '1' => 'deferred update 1', - '2' => 'deferred update 2', - '2-1' => 'deferred update 1 within deferred update 2', - '3' => 'deferred update 3', + '1' => "deferred update 1;\n", + '2' => "deferred update 2;\n", + '2-1' => "deferred update 1 within deferred update 2;\n", + '2-2' => "deferred update 2 within deferred update 2;\n", + '3' => "deferred update 3;\n", + '3-1' => "deferred update 1 within deferred update 3;\n", + '3-2' => "deferred update 2 within deferred update 3;\n", + '3-1-1' => "deferred update 1 within deferred update 1 within deferred update 3;\n", + '3-2-1' => "deferred update 1 within deferred update 2 with deferred update 3;\n", ]; + + wfGetLBFactory()->commitMasterChanges( __METHOD__ ); // clear anything + DeferredUpdates::addCallableUpdate( function () use ( $updates ) { echo $updates['1']; @@ -83,11 +122,36 @@ class DeferredUpdatesTest extends MediaWikiTestCase { echo $updates['2-1']; } ); + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['2-2']; + } + ); } ); DeferredUpdates::addCallableUpdate( function () use ( $updates ) { - echo $updates[3]; + echo $updates['3']; + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['3-1']; + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['3-1-1']; + } + ); + } + ); + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['3-2']; + DeferredUpdates::addCallableUpdate( + function () use ( $updates ) { + echo $updates['3-2-1']; + } + ); + } + ); } ); diff --git a/tests/phpunit/includes/deferred/LinksUpdateTest.php b/tests/phpunit/includes/deferred/LinksUpdateTest.php index 3309352fde..9cc3ffdab7 100644 --- a/tests/phpunit/includes/deferred/LinksUpdateTest.php +++ b/tests/phpunit/includes/deferred/LinksUpdateTest.php @@ -369,10 +369,7 @@ class LinksUpdateTest extends MediaWikiLangTestCase { ) { $update = new LinksUpdate( $title, $parserOutput ); - // NOTE: make sure LinksUpdate does not generate warnings when called inside a transaction. - $update->beginTransaction(); $update->doUpdate(); - $update->commitTransaction(); $this->assertSelect( $table, $fields, $condition, $expectedRows ); return $update; diff --git a/tests/phpunit/includes/exception/MWExceptionTest.php b/tests/phpunit/includes/exception/MWExceptionTest.php index 0e87ffa42f..7c36f7d13d 100644 --- a/tests/phpunit/includes/exception/MWExceptionTest.php +++ b/tests/phpunit/includes/exception/MWExceptionTest.php @@ -173,7 +173,6 @@ class MWExceptionTest extends MediaWikiTestCase { * @dataProvider provideJsonSerializedKeys */ public function testJsonserializeexceptionKeys( $expectedKeyType, $exClass, $key ) { - # Make sure we log a backtrace: $this->setMwGlobals( [ 'wgLogExceptionBacktrace' => true ] ); @@ -235,7 +234,6 @@ class MWExceptionTest extends MediaWikiTestCase { MWExceptionHandler::jsonSerializeException( new Exception() ) ); $this->assertObjectNotHasAttribute( 'backtrace', $json ); - } } diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php b/tests/phpunit/includes/filebackend/FileBackendTest.php index 254cfbd677..c3d31d1222 100644 --- a/tests/phpunit/includes/filebackend/FileBackendTest.php +++ b/tests/phpunit/includes/filebackend/FileBackendTest.php @@ -268,7 +268,7 @@ class FileBackendTest extends MediaWikiTestCase { public static function provider_testStore() { $cases = []; - $tmpName = TempFSFile::factory( "unittests_", 'txt' )->getPath(); + $tmpName = TempFSFile::factory( "unittests_", 'txt', wfTempDir() )->getPath(); $toPath = self::baseStorePath() . '/unittest-cont1/e/fun/obj1.txt'; $op = [ 'op' => 'store', 'src' => $tmpName, 'dst' => $toPath ]; $cases[] = [ $op ]; @@ -1786,9 +1786,9 @@ class FileBackendTest extends MediaWikiTestCase { $fileBContents = 'g-jmq3gpqgt3qtg q3GT '; $fileCContents = 'eigna[ogmewt 3qt g3qg flew[ag'; - $tmpNameA = TempFSFile::factory( "unittests_", 'txt' )->getPath(); - $tmpNameB = TempFSFile::factory( "unittests_", 'txt' )->getPath(); - $tmpNameC = TempFSFile::factory( "unittests_", 'txt' )->getPath(); + $tmpNameA = TempFSFile::factory( "unittests_", 'txt', wfTempDir() )->getPath(); + $tmpNameB = TempFSFile::factory( "unittests_", 'txt', wfTempDir() )->getPath(); + $tmpNameC = TempFSFile::factory( "unittests_", 'txt', wfTempDir() )->getPath(); $this->addTmpFiles( [ $tmpNameA, $tmpNameB, $tmpNameC ] ); file_put_contents( $tmpNameA, $fileAContents ); file_put_contents( $tmpNameB, $fileBContents ); @@ -1914,7 +1914,7 @@ class FileBackendTest extends MediaWikiTestCase { // Does nothing ], [ 'force' => 1 ] ); - $this->assertNotEquals( [], $status->errors, "Operation had warnings" ); + $this->assertNotEquals( [], $status->getErrors(), "Operation had warnings" ); $this->assertEquals( true, $status->isOK(), "Operation batch succeeded" ); $this->assertEquals( 8, count( $status->success ), "Operation batch has correct success array" ); @@ -2371,25 +2371,25 @@ class FileBackendTest extends MediaWikiTestCase { for ( $i = 0; $i < 25; $i++ ) { $status = $this->backend->lockFiles( $paths, LockManager::LOCK_EX ); - $this->assertEquals( print_r( [], true ), print_r( $status->errors, true ), + $this->assertEquals( print_r( [], true ), print_r( $status->getErrors(), true ), "Locking of files succeeded ($backendName) ($i)." ); $this->assertEquals( true, $status->isOK(), "Locking of files succeeded with OK status ($backendName) ($i)." ); $status = $this->backend->lockFiles( $paths, LockManager::LOCK_SH ); - $this->assertEquals( print_r( [], true ), print_r( $status->errors, true ), + $this->assertEquals( print_r( [], true ), print_r( $status->getErrors(), true ), "Locking of files succeeded ($backendName) ($i)." ); $this->assertEquals( true, $status->isOK(), "Locking of files succeeded with OK status ($backendName) ($i)." ); $status = $this->backend->unlockFiles( $paths, LockManager::LOCK_SH ); - $this->assertEquals( print_r( [], true ), print_r( $status->errors, true ), + $this->assertEquals( print_r( [], true ), print_r( $status->getErrors(), true ), "Locking of files succeeded ($backendName) ($i)." ); $this->assertEquals( true, $status->isOK(), "Locking of files succeeded with OK status ($backendName) ($i)." ); $status = $this->backend->unlockFiles( $paths, LockManager::LOCK_EX ); - $this->assertEquals( print_r( [], true ), print_r( $status->errors, true ), + $this->assertEquals( print_r( [], true ), print_r( $status->getErrors(), true ), "Locking of files succeeded ($backendName). ($i)" ); $this->assertEquals( true, $status->isOK(), "Locking of files succeeded with OK status ($backendName) ($i)." ); @@ -2397,25 +2397,25 @@ class FileBackendTest extends MediaWikiTestCase { # # Flip the acquire/release ordering around ## $status = $this->backend->lockFiles( $paths, LockManager::LOCK_SH ); - $this->assertEquals( print_r( [], true ), print_r( $status->errors, true ), + $this->assertEquals( print_r( [], true ), print_r( $status->getErrors(), true ), "Locking of files succeeded ($backendName) ($i)." ); $this->assertEquals( true, $status->isOK(), "Locking of files succeeded with OK status ($backendName) ($i)." ); $status = $this->backend->lockFiles( $paths, LockManager::LOCK_EX ); - $this->assertEquals( print_r( [], true ), print_r( $status->errors, true ), + $this->assertEquals( print_r( [], true ), print_r( $status->getErrors(), true ), "Locking of files succeeded ($backendName) ($i)." ); $this->assertEquals( true, $status->isOK(), "Locking of files succeeded with OK status ($backendName) ($i)." ); $status = $this->backend->unlockFiles( $paths, LockManager::LOCK_EX ); - $this->assertEquals( print_r( [], true ), print_r( $status->errors, true ), + $this->assertEquals( print_r( [], true ), print_r( $status->getErrors(), true ), "Locking of files succeeded ($backendName). ($i)" ); $this->assertEquals( true, $status->isOK(), "Locking of files succeeded with OK status ($backendName) ($i)." ); $status = $this->backend->unlockFiles( $paths, LockManager::LOCK_SH ); - $this->assertEquals( print_r( [], true ), print_r( $status->errors, true ), + $this->assertEquals( print_r( [], true ), print_r( $status->getErrors(), true ), "Locking of files succeeded ($backendName) ($i)." ); $this->assertEquals( true, $status->isOK(), "Locking of files succeeded with OK status ($backendName) ($i)." ); @@ -2425,7 +2425,7 @@ class FileBackendTest extends MediaWikiTestCase { $sl = $this->backend->getScopedFileLocks( $paths, LockManager::LOCK_EX, $status ); $this->assertInstanceOf( 'ScopedLock', $sl, "Scoped locking of files succeeded ($backendName)." ); - $this->assertEquals( [], $status->errors, + $this->assertEquals( [], $status->getErrors(), "Scoped locking of files succeeded ($backendName)." ); $this->assertEquals( true, $status->isOK(), "Scoped locking of files succeeded with OK status ($backendName)." ); @@ -2433,7 +2433,7 @@ class FileBackendTest extends MediaWikiTestCase { ScopedLock::release( $sl ); $this->assertEquals( null, $sl, "Scoped unlocking of files succeeded ($backendName)." ); - $this->assertEquals( [], $status->errors, + $this->assertEquals( [], $status->getErrors(), "Scoped unlocking of files succeeded ($backendName)." ); $this->assertEquals( true, $status->isOK(), "Scoped unlocking of files succeeded with OK status ($backendName)." ); @@ -2647,7 +2647,7 @@ class FileBackendTest extends MediaWikiTestCase { } } - function assertGoodStatus( $status, $msg ) { - $this->assertEquals( print_r( [], 1 ), print_r( $status->errors, 1 ), $msg ); + function assertGoodStatus( StatusValue $status, $msg ) { + $this->assertEquals( print_r( [], 1 ), print_r( $status->getErrors(), 1 ), $msg ); } } diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php index ed80c573a2..92a54faca1 100644 --- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php +++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php @@ -59,7 +59,8 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase { ->method( 'getRepo' ) ->will( $this->returnValue( $repoMock ) ); - $this->tmpFilepath = TempFSFile::factory( 'migratefilelayout-test-', 'png' )->getPath(); + $this->tmpFilepath = TempFSFile::factory( + 'migratefilelayout-test-', 'png', wfTempDir() )->getPath(); file_put_contents( $this->tmpFilepath, $this->text ); diff --git a/tests/phpunit/includes/filerepo/file/FileTest.php b/tests/phpunit/includes/filerepo/file/FileTest.php index c5fd369f14..6520610786 100644 --- a/tests/phpunit/includes/filerepo/file/FileTest.php +++ b/tests/phpunit/includes/filerepo/file/FileTest.php @@ -206,7 +206,7 @@ class FileTest extends MediaWikiMediaTestCase { ] ], [ [ 'supportsBucketing' => true, - 'tmpBucketedThumbCache' => [ 1024 => '/tmp/shouldnotexist' + rand() ], + 'tmpBucketedThumbCache' => [ 1024 => '/tmp/shouldnotexist' . rand() ], 'thumbnailBucket' => 1024, 'physicalWidth' => 2048, 'expectedPath' => 'fsFilePath', diff --git a/tests/phpunit/includes/htmlform/HTMLAutoCompleteSelectFieldTest.php b/tests/phpunit/includes/htmlform/HTMLAutoCompleteSelectFieldTest.php index fbabf7ffad..33e3a257d2 100644 --- a/tests/phpunit/includes/htmlform/HTMLAutoCompleteSelectFieldTest.php +++ b/tests/phpunit/includes/htmlform/HTMLAutoCompleteSelectFieldTest.php @@ -49,9 +49,9 @@ class HtmlAutoCompleteSelectFieldTest extends MediaWikiTestCase { */ function testOptionalSelectElement() { $params = [ - 'fieldname' => 'Test', - 'autocomplete' => $this->options, - 'options' => $this->options, + 'fieldname' => 'Test', + 'autocomplete-data' => $this->options, + 'options' => $this->options, ]; $field = new HTMLAutoCompleteSelectField( $params ); diff --git a/tests/phpunit/includes/htmlform/HTMLCheckMatrixTest.php b/tests/phpunit/includes/htmlform/HTMLCheckMatrixTest.php index dd5b58bd5e..f97716b9e5 100644 --- a/tests/phpunit/includes/htmlform/HTMLCheckMatrixTest.php +++ b/tests/phpunit/includes/htmlform/HTMLCheckMatrixTest.php @@ -51,7 +51,7 @@ class HtmlCheckMatrixTest extends MediaWikiTestCase { public function testValidateAllowsOnlyKnownTags() { $field = new HTMLCheckMatrix( self::$defaultOptions ); - $this->assertInternalType( 'string', $this->validate( $field, [ 'foo' ] ) ); + $this->assertInstanceOf( Message::class, $this->validate( $field, [ 'foo' ] ) ); } public function testValidateAcceptsPartialTagList() { diff --git a/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php b/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php new file mode 100644 index 0000000000..9ec4f97fd0 --- /dev/null +++ b/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php @@ -0,0 +1,65 @@ + 'restrictions' ] ); + $this->assertNotEmpty( $field->getLabel(), 'has a default label' ); + $this->assertNotEmpty( $field->getHelpText(), 'has a default help text' ); + $this->assertEquals( MWRestrictions::newDefault(), $field->getDefault(), + 'defaults to the default MWRestrictions object' ); + + $field = new HTMLRestrictionsField( [ + 'fieldname' => 'restrictions', + 'label' => 'foo', + 'help' => 'bar', + 'default' => 'baz', + ] ); + $this->assertEquals( 'foo', $field->getLabel(), 'label can be customized' ); + $this->assertEquals( 'bar', $field->getHelpText(), 'help text can be customized' ); + $this->assertEquals( 'baz', $field->getDefault(), 'default can be customized' ); + } + + /** + * @dataProvider provideValidate + */ + public function testForm( $text, $value ) { + $form = HTMLForm::factory( 'ooui', [ + 'restrictions' => [ 'class' => HTMLRestrictionsField::class ], + ] ); + $request = new FauxRequest( [ 'wprestrictions' => $text ], true ); + $context = new DerivativeContext( RequestContext::getMain() ); + $context->setRequest( $request ); + $form->setContext( $context ); + $form->setTitle( Title::newFromText( 'Main Page' ) )->setSubmitCallback( function () { + return true; + } )->prepareForm(); + $status = $form->trySubmit(); + + if ( $status instanceof StatusValue ) { + $this->assertEquals( $value !== false, $status->isGood() ); + } elseif ( $value === false ) { + $this->assertNotSame( true, $status ); + } else { + $this->assertSame( true, $status ); + } + + if ( $value !== false ) { + $restrictions = $form->mFieldData['restrictions']; + $this->assertInstanceOf( MWRestrictions::class, $restrictions ); + $this->assertEquals( $value, $restrictions->toArray()['IPAddresses'] ); + } + + // sanity + $form->getHTML( $status ); + } + + public function provideValidate() { + return [ + // submitted text, value of 'IPAddresses' key or false for validation error + [ null, [ '0.0.0.0/0', '::/0' ] ], + [ '', [] ], + [ "1.2.3.4\n::/0", [ '1.2.3.4', '::/0' ] ], + [ "1.2.3.4\n::/x", false ], + ]; + } +} diff --git a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php index 5e3c6268aa..8e06f9e968 100644 --- a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php +++ b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php @@ -1,4 +1,6 @@ value, - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); $importer->setDebug( true ); diff --git a/tests/phpunit/includes/import/ImportTest.php b/tests/phpunit/includes/import/ImportTest.php index 9d05d15256..53d91c6593 100644 --- a/tests/phpunit/includes/import/ImportTest.php +++ b/tests/phpunit/includes/import/ImportTest.php @@ -1,4 +1,5 @@ makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); $importer->doImport(); @@ -92,7 +93,7 @@ EOF $importer = new WikiImporter( $source, - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); $importer->setPageOutCallback( $callback ); $importer->doImport(); @@ -175,7 +176,7 @@ EOF $importer = new WikiImporter( $source, - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) + MediaWikiServices::getInstance()->getMainConfig() ); $importer->setSiteInfoCallback( $callback ); $importer->doImport(); diff --git a/tests/phpunit/includes/installer/DatabaseUpdaterTest.php b/tests/phpunit/includes/installer/DatabaseUpdaterTest.php index 81c9fafac3..2a75cf4020 100644 --- a/tests/phpunit/includes/installer/DatabaseUpdaterTest.php +++ b/tests/phpunit/includes/installer/DatabaseUpdaterTest.php @@ -16,11 +16,18 @@ class DatabaseUpdaterTest extends MediaWikiTestCase { } } -class FakeDatabase extends DatabaseBase { +class FakeDatabase extends Database { public $lastInsertTable; public $lastInsertData; function __construct() { + $this->cliMode = true; + $this->connLogger = new \Psr\Log\NullLogger(); + $this->queryLogger = new \Psr\Log\NullLogger(); + $this->errorLogger = function ( Exception $e ) { + wfWarn( get_class( $e ) . ": {$e->getMessage()}" ); + }; + $this->currentDomain = DatabaseDomain::newUnspecified(); } function clearFlag( $arg, $remember = self::REMEMBER_NOTHING ) { @@ -63,7 +70,7 @@ class FakeDatabase extends DatabaseBase { * member variables. * If no more rows are available, false is returned. * - * @param ResultWrapper|stdClass $res Object as returned from DatabaseBase::query(), etc. + * @param ResultWrapper|stdClass $res Object as returned from Database::query(), etc. * @return stdClass|bool * @throws DBUnexpectedError Thrown if the database returns an error */ @@ -76,7 +83,7 @@ class FakeDatabase extends DatabaseBase { * form. Fields are retrieved with $row['fieldname']. * If no more rows are available, false is returned. * - * @param ResultWrapper $res Result object as returned from DatabaseBase::query(), etc. + * @param ResultWrapper $res Result object as returned from Database::query(), etc. * @return array|bool * @throws DBUnexpectedError Thrown if the database returns an error */ @@ -96,7 +103,7 @@ class FakeDatabase extends DatabaseBase { /** * Get the number of fields in a result object - * @see http://www.php.net/mysql_num_fields + * @see https://secure.php.net/mysql_num_fields * * @param mixed $res A SQL result * @return int @@ -107,7 +114,7 @@ class FakeDatabase extends DatabaseBase { /** * Get a field name in a result object - * @see http://www.php.net/mysql_field_name + * @see https://secure.php.net/mysql_field_name * * @param mixed $res A SQL result * @param int $n @@ -135,7 +142,7 @@ class FakeDatabase extends DatabaseBase { /** * Change the position of the cursor in a result object - * @see http://www.php.net/mysql_data_seek + * @see https://secure.php.net/mysql_data_seek * * @param mixed $res A SQL result * @param int $row @@ -146,7 +153,7 @@ class FakeDatabase extends DatabaseBase { /** * Get the last error number - * @see http://www.php.net/mysql_errno + * @see https://secure.php.net/mysql_errno * * @return int */ @@ -156,7 +163,7 @@ class FakeDatabase extends DatabaseBase { /** * Get a description of the last error - * @see http://www.php.net/mysql_error + * @see https://secure.php.net/mysql_error * * @return string */ @@ -190,7 +197,7 @@ class FakeDatabase extends DatabaseBase { /** * Get the number of rows affected by the last write query - * @see http://www.php.net/mysql_affected_rows + * @see https://secure.php.net/mysql_affected_rows * * @return int */ @@ -210,7 +217,7 @@ class FakeDatabase extends DatabaseBase { /** * Returns a wikitext link to the DB's website, e.g., - * return "[http://www.mysql.com/ MySQL]"; + * return "[https://www.mysql.com/ MySQL]"; * Should at least contain plain text, if for some reason * your database has no website. * diff --git a/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php b/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php new file mode 100644 index 0000000000..4754b040f9 --- /dev/null +++ b/tests/phpunit/includes/interwiki/InterwikiLookupAdapterTest.php @@ -0,0 +1,117 @@ +interwikiLookup = new InterwikiLookupAdapter( + $this->getSiteLookup( $this->getSites() ) + ); + } + + public function testIsValidInterwiki() { + $this->assertTrue( + $this->interwikiLookup->isValidInterwiki( 'enwt' ), + 'enwt known prefix is valid' + ); + $this->assertTrue( + $this->interwikiLookup->isValidInterwiki( 'foo' ), + 'foo site known prefix is valid' + ); + $this->assertFalse( + $this->interwikiLookup->isValidInterwiki( 'xyz' ), + 'unknown prefix is not valid' + ); + } + + public function testFetch() { + + $interwiki = $this->interwikiLookup->fetch( '' ); + $this->assertNull( $interwiki ); + + $interwiki = $this->interwikiLookup->fetch( 'xyz' ); + $this->assertFalse( $interwiki ); + + $interwiki = $this->interwikiLookup->fetch( 'foo' ); + $this->assertInstanceOf( Interwiki::class, $interwiki ); + $this->assertSame( 'foobar', $interwiki->getWikiID() ); + + $interwiki = $this->interwikiLookup->fetch( 'enwt' ); + $this->assertInstanceOf( Interwiki::class, $interwiki ); + + $this->assertSame( 'https://en.wiktionary.org/wiki/$1', $interwiki->getURL(), 'getURL' ); + $this->assertSame( 'https://en.wiktionary.org/w/api.php', $interwiki->getAPI(), 'getAPI' ); + $this->assertSame( 'enwiktionary', $interwiki->getWikiID(), 'getWikiID' ); + $this->assertTrue( $interwiki->isLocal(), 'isLocal' ); + } + + public function testGetAllPrefixes() { + $this->assertEquals( + [ 'foo', 'enwt' ], + $this->interwikiLookup->getAllPrefixes(), + 'getAllPrefixes()' + ); + + $this->assertEquals( + [ 'foo' ], + $this->interwikiLookup->getAllPrefixes( false ), + 'get external prefixes' + ); + + $this->assertEquals( + [ 'enwt' ], + $this->interwikiLookup->getAllPrefixes( true ), + 'get local prefixes' + ); + } + + private function getSiteLookup( SiteList $sites ) { + $siteLookup = $this->getMockBuilder( SiteLookup::class ) + ->disableOriginalConstructor() + ->getMock(); + + $siteLookup->expects( $this->any() ) + ->method( 'getSites' ) + ->will( $this->returnValue( $sites ) ); + + return $siteLookup; + } + + private function getSites() { + $sites = []; + + $site = new Site(); + $site->setGlobalId( 'foobar' ); + $site->addInterwikiId( 'foo' ); + $site->setSource( 'external' ); + $sites[] = $site; + + $site = new MediaWikiSite(); + $site->setGlobalId( 'enwiktionary' ); + $site->setGroup( 'wiktionary' ); + $site->setLanguageCode( 'en' ); + $site->addNavigationId( 'enwiktionary' ); + $site->addInterwikiId( 'enwt' ); + $site->setSource( 'local' ); + $site->setPath( MediaWikiSite::PATH_PAGE, "https://en.wiktionary.org/wiki/$1" ); + $site->setPath( MediaWikiSite::PATH_FILE, "https://en.wiktionary.org/w/$1" ); + $sites[] = $site; + + return new SiteList( $sites ); + } + +} diff --git a/tests/phpunit/includes/json/FormatJsonTest.php b/tests/phpunit/includes/json/FormatJsonTest.php index 01b575ca93..d252c80732 100644 --- a/tests/phpunit/includes/json/FormatJsonTest.php +++ b/tests/phpunit/includes/json/FormatJsonTest.php @@ -146,7 +146,7 @@ class FormatJsonTest extends MediaWikiTestCase { * @return stdClass|string|bool|int|float|null */ public static function toObject( $value ) { - return !is_array( $value ) ? $value : (object) array_map( __METHOD__, $value ); + return !is_array( $value ) ? $value : (object)array_map( __METHOD__, $value ); } /** diff --git a/tests/phpunit/includes/libs/CSSMinTest.php b/tests/phpunit/includes/libs/CSSMinTest.php index 5f5a1e8f01..366714b193 100644 --- a/tests/phpunit/includes/libs/CSSMinTest.php +++ b/tests/phpunit/includes/libs/CSSMinTest.php @@ -129,8 +129,8 @@ class CSSMinTest extends MediaWikiTestCase { * @covers CSSMin::remap */ public function testRemapRemapping( $message, $input, $expectedOutput ) { - $localPath = __DIR__ . '/../../data/cssmin/'; - $remotePath = 'http://localhost/w/'; + $localPath = __DIR__ . '/../../data/cssmin'; + $remotePath = 'http://localhost/w'; $realOutput = CSSMin::remap( $input, $localPath, $remotePath ); $this->assertEquals( $expectedOutput, $realOutput, "CSSMin::remap: $message" ); diff --git a/tests/phpunit/includes/libs/IPTest.php b/tests/phpunit/includes/libs/IPTest.php new file mode 100644 index 0000000000..307652d938 --- /dev/null +++ b/tests/phpunit/includes/libs/IPTest.php @@ -0,0 +1,670 @@ +assertFalse( IP::isIPAddress( $val ), $desc ); + } + + /** + * Provide a list of things that aren't IP addresses + */ + public function provideInvalidIPs() { + return [ + [ false, 'Boolean false is not an IP' ], + [ true, 'Boolean true is not an IP' ], + [ '', 'Empty string is not an IP' ], + [ 'abc', 'Garbage IP string' ], + [ ':', 'Single ":" is not an IP' ], + [ '2001:0DB8::A:1::1', 'IPv6 with a double :: occurrence' ], + [ '2001:0DB8::A:1::', 'IPv6 with a double :: occurrence, last at end' ], + [ '::2001:0DB8::5:1', 'IPv6 with a double :: occurrence, firt at beginning' ], + [ '124.24.52', 'IPv4 not enough quads' ], + [ '24.324.52.13', 'IPv4 out of range' ], + [ '.24.52.13', 'IPv4 starts with period' ], + [ 'fc:100:300', 'IPv6 with only 3 words' ], + ]; + } + + /** + * @covers IP::isIPAddress + */ + public function testisIPAddress() { + $this->assertTrue( IP::isIPAddress( '::' ), 'RFC 4291 IPv6 Unspecified Address' ); + $this->assertTrue( IP::isIPAddress( '::1' ), 'RFC 4291 IPv6 Loopback Address' ); + $this->assertTrue( IP::isIPAddress( '74.24.52.13/20' ), 'IPv4 range' ); + $this->assertTrue( IP::isIPAddress( 'fc:100:a:d:1:e:ac:0/24' ), 'IPv6 range' ); + $this->assertTrue( IP::isIPAddress( 'fc::100:a:d:1:e:ac/96' ), 'IPv6 range with "::"' ); + + $validIPs = [ 'fc:100::', 'fc:100:a:d:1:e:ac::', 'fc::100', '::fc:100:a:d:1:e:ac', + '::fc', 'fc::100:a:d:1:e:ac', 'fc:100:a:d:1:e:ac:0', '124.24.52.13', '1.24.52.13' ]; + foreach ( $validIPs as $ip ) { + $this->assertTrue( IP::isIPAddress( $ip ), "$ip is a valid IP address" ); + } + } + + /** + * @covers IP::isIPv6 + */ + public function testisIPv6() { + $this->assertFalse( IP::isIPv6( ':fc:100::' ), 'IPv6 starting with lone ":"' ); + $this->assertFalse( IP::isIPv6( 'fc:100:::' ), 'IPv6 ending with a ":::"' ); + $this->assertFalse( IP::isIPv6( 'fc:300' ), 'IPv6 with only 2 words' ); + $this->assertFalse( IP::isIPv6( 'fc:100:300' ), 'IPv6 with only 3 words' ); + + $this->assertTrue( IP::isIPv6( 'fc:100::' ) ); + $this->assertTrue( IP::isIPv6( 'fc:100:a::' ) ); + $this->assertTrue( IP::isIPv6( 'fc:100:a:d::' ) ); + $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1::' ) ); + $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e::' ) ); + $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e:ac::' ) ); + + $this->assertFalse( IP::isIPv6( 'fc:100:a:d:1:e:ac:0::' ), 'IPv6 with 8 words ending with "::"' ); + $this->assertFalse( + IP::isIPv6( 'fc:100:a:d:1:e:ac:0:1::' ), + 'IPv6 with 9 words ending with "::"' + ); + + $this->assertFalse( IP::isIPv6( ':::' ) ); + $this->assertFalse( IP::isIPv6( '::0:' ), 'IPv6 ending in a lone ":"' ); + + $this->assertTrue( IP::isIPv6( '::' ), 'IPv6 zero address' ); + $this->assertTrue( IP::isIPv6( '::0' ) ); + $this->assertTrue( IP::isIPv6( '::fc' ) ); + $this->assertTrue( IP::isIPv6( '::fc:100' ) ); + $this->assertTrue( IP::isIPv6( '::fc:100:a' ) ); + $this->assertTrue( IP::isIPv6( '::fc:100:a:d' ) ); + $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1' ) ); + $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1:e' ) ); + $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1:e:ac' ) ); + + $this->assertFalse( IP::isIPv6( '::fc:100:a:d:1:e:ac:0' ), 'IPv6 with "::" and 8 words' ); + $this->assertFalse( IP::isIPv6( '::fc:100:a:d:1:e:ac:0:1' ), 'IPv6 with 9 words' ); + + $this->assertFalse( IP::isIPv6( ':fc::100' ), 'IPv6 starting with lone ":"' ); + $this->assertFalse( IP::isIPv6( 'fc::100:' ), 'IPv6 ending with lone ":"' ); + $this->assertFalse( IP::isIPv6( 'fc:::100' ), 'IPv6 with ":::" in the middle' ); + + $this->assertTrue( IP::isIPv6( 'fc::100' ), 'IPv6 with "::" and 2 words' ); + $this->assertTrue( IP::isIPv6( 'fc::100:a' ), 'IPv6 with "::" and 3 words' ); + $this->assertTrue( IP::isIPv6( 'fc::100:a:d' ), 'IPv6 with "::" and 4 words' ); + $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1' ), 'IPv6 with "::" and 5 words' ); + $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e' ), 'IPv6 with "::" and 6 words' ); + $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e:ac' ), 'IPv6 with "::" and 7 words' ); + $this->assertTrue( IP::isIPv6( '2001::df' ), 'IPv6 with "::" and 2 words' ); + $this->assertTrue( IP::isIPv6( '2001:5c0:1400:a::df' ), 'IPv6 with "::" and 5 words' ); + $this->assertTrue( IP::isIPv6( '2001:5c0:1400:a::df:2' ), 'IPv6 with "::" and 6 words' ); + + $this->assertFalse( IP::isIPv6( 'fc::100:a:d:1:e:ac:0' ), 'IPv6 with "::" and 8 words' ); + $this->assertFalse( IP::isIPv6( 'fc::100:a:d:1:e:ac:0:1' ), 'IPv6 with 9 words' ); + + $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e:ac:0' ) ); + } + + /** + * @covers IP::isIPv4 + * @dataProvider provideInvalidIPv4Addresses + */ + public function testisNotIPv4( $bogusIP, $desc ) { + $this->assertFalse( IP::isIPv4( $bogusIP ), $desc ); + } + + public function provideInvalidIPv4Addresses() { + return [ + [ false, 'Boolean false is not an IP' ], + [ true, 'Boolean true is not an IP' ], + [ '', 'Empty string is not an IP' ], + [ 'abc', 'Letters are not an IP' ], + [ ':', 'A colon is not an IP' ], + [ '124.24.52', 'IPv4 not enough quads' ], + [ '24.324.52.13', 'IPv4 out of range' ], + [ '.24.52.13', 'IPv4 starts with period' ], + ]; + } + + /** + * @covers IP::isIPv4 + * @dataProvider provideValidIPv4Address + */ + public function testIsIPv4( $ip, $desc ) { + $this->assertTrue( IP::isIPv4( $ip ), $desc ); + } + + /** + * Provide some IPv4 addresses and ranges + */ + public function provideValidIPv4Address() { + return [ + [ '124.24.52.13', 'Valid IPv4 address' ], + [ '1.24.52.13', 'Another valid IPv4 address' ], + [ '74.24.52.13/20', 'An IPv4 range' ], + ]; + } + + /** + * @covers IP::isValid + */ + public function testValidIPs() { + foreach ( range( 0, 255 ) as $i ) { + $a = sprintf( "%03d", $i ); + $b = sprintf( "%02d", $i ); + $c = sprintf( "%01d", $i ); + foreach ( array_unique( [ $a, $b, $c ] ) as $f ) { + $ip = "$f.$f.$f.$f"; + $this->assertTrue( IP::isValid( $ip ), "$ip is a valid IPv4 address" ); + } + } + foreach ( range( 0x0, 0xFFFF, 0xF ) as $i ) { + $a = sprintf( "%04x", $i ); + $b = sprintf( "%03x", $i ); + $c = sprintf( "%02x", $i ); + foreach ( array_unique( [ $a, $b, $c ] ) as $f ) { + $ip = "$f:$f:$f:$f:$f:$f:$f:$f"; + $this->assertTrue( IP::isValid( $ip ), "$ip is a valid IPv6 address" ); + } + } + // test with some abbreviations + $this->assertFalse( IP::isValid( ':fc:100::' ), 'IPv6 starting with lone ":"' ); + $this->assertFalse( IP::isValid( 'fc:100:::' ), 'IPv6 ending with a ":::"' ); + $this->assertFalse( IP::isValid( 'fc:300' ), 'IPv6 with only 2 words' ); + $this->assertFalse( IP::isValid( 'fc:100:300' ), 'IPv6 with only 3 words' ); + + $this->assertTrue( IP::isValid( 'fc:100::' ) ); + $this->assertTrue( IP::isValid( 'fc:100:a:d:1:e::' ) ); + $this->assertTrue( IP::isValid( 'fc:100:a:d:1:e:ac::' ) ); + + $this->assertTrue( IP::isValid( 'fc::100' ), 'IPv6 with "::" and 2 words' ); + $this->assertTrue( IP::isValid( 'fc::100:a' ), 'IPv6 with "::" and 3 words' ); + $this->assertTrue( IP::isValid( '2001::df' ), 'IPv6 with "::" and 2 words' ); + $this->assertTrue( IP::isValid( '2001:5c0:1400:a::df' ), 'IPv6 with "::" and 5 words' ); + $this->assertTrue( IP::isValid( '2001:5c0:1400:a::df:2' ), 'IPv6 with "::" and 6 words' ); + $this->assertTrue( IP::isValid( 'fc::100:a:d:1' ), 'IPv6 with "::" and 5 words' ); + $this->assertTrue( IP::isValid( 'fc::100:a:d:1:e:ac' ), 'IPv6 with "::" and 7 words' ); + + $this->assertFalse( + IP::isValid( 'fc:100:a:d:1:e:ac:0::' ), + 'IPv6 with 8 words ending with "::"' + ); + $this->assertFalse( + IP::isValid( 'fc:100:a:d:1:e:ac:0:1::' ), + 'IPv6 with 9 words ending with "::"' + ); + } + + /** + * @covers IP::isValid + */ + public function testInvalidIPs() { + // Out of range... + foreach ( range( 256, 999 ) as $i ) { + $a = sprintf( "%03d", $i ); + $b = sprintf( "%02d", $i ); + $c = sprintf( "%01d", $i ); + foreach ( array_unique( [ $a, $b, $c ] ) as $f ) { + $ip = "$f.$f.$f.$f"; + $this->assertFalse( IP::isValid( $ip ), "$ip is not a valid IPv4 address" ); + } + } + foreach ( range( 'g', 'z' ) as $i ) { + $a = sprintf( "%04s", $i ); + $b = sprintf( "%03s", $i ); + $c = sprintf( "%02s", $i ); + foreach ( array_unique( [ $a, $b, $c ] ) as $f ) { + $ip = "$f:$f:$f:$f:$f:$f:$f:$f"; + $this->assertFalse( IP::isValid( $ip ), "$ip is not a valid IPv6 address" ); + } + } + // Have CIDR + $ipCIDRs = [ + '212.35.31.121/32', + '212.35.31.121/18', + '212.35.31.121/24', + '::ff:d:321:5/96', + 'ff::d3:321:5/116', + 'c:ff:12:1:ea:d:321:5/120', + ]; + foreach ( $ipCIDRs as $i ) { + $this->assertFalse( IP::isValid( $i ), + "$i is an invalid IP address because it is a block" ); + } + // Incomplete/garbage + $invalid = [ + 'www.xn--var-xla.net', + '216.17.184.G', + '216.17.184.1.', + '216.17.184', + '216.17.184.', + '256.17.184.1' + ]; + foreach ( $invalid as $i ) { + $this->assertFalse( IP::isValid( $i ), "$i is an invalid IP address" ); + } + } + + /** + * Provide some valid IP blocks + */ + public function provideValidBlocks() { + return [ + [ '116.17.184.5/32' ], + [ '0.17.184.5/30' ], + [ '16.17.184.1/24' ], + [ '30.242.52.14/1' ], + [ '10.232.52.13/8' ], + [ '30.242.52.14/0' ], + [ '::e:f:2001/96' ], + [ '::c:f:2001/128' ], + [ '::10:f:2001/70' ], + [ '::fe:f:2001/1' ], + [ '::6d:f:2001/8' ], + [ '::fe:f:2001/0' ], + ]; + } + + /** + * @covers IP::isValidBlock + * @dataProvider provideValidBlocks + */ + public function testValidBlocks( $block ) { + $this->assertTrue( IP::isValidBlock( $block ), "$block is a valid IP block" ); + } + + /** + * @covers IP::isValidBlock + * @dataProvider provideInvalidBlocks + */ + public function testInvalidBlocks( $invalid ) { + $this->assertFalse( IP::isValidBlock( $invalid ), "$invalid is not a valid IP block" ); + } + + public function provideInvalidBlocks() { + return [ + [ '116.17.184.5/33' ], + [ '0.17.184.5/130' ], + [ '16.17.184.1/-1' ], + [ '10.232.52.13/*' ], + [ '7.232.52.13/ab' ], + [ '11.232.52.13/' ], + [ '::e:f:2001/129' ], + [ '::c:f:2001/228' ], + [ '::10:f:2001/-1' ], + [ '::6d:f:2001/*' ], + [ '::86:f:2001/ab' ], + [ '::23:f:2001/' ], + ]; + } + + /** + * @covers IP::sanitizeIP + * @dataProvider provideSanitizeIP + */ + public function testSanitizeIP( $expected, $input ) { + $result = IP::sanitizeIP( $input ); + $this->assertEquals( $expected, $result ); + } + + /** + * Provider for IP::testSanitizeIP() + */ + public static function provideSanitizeIP() { + return [ + [ '0.0.0.0', '0.0.0.0' ], + [ '0.0.0.0', '00.00.00.00' ], + [ '0.0.0.0', '000.000.000.000' ], + [ '141.0.11.253', '141.000.011.253' ], + [ '1.2.4.5', '1.2.4.5' ], + [ '1.2.4.5', '01.02.04.05' ], + [ '1.2.4.5', '001.002.004.005' ], + [ '10.0.0.1', '010.0.000.1' ], + [ '80.72.250.4', '080.072.250.04' ], + [ 'Foo.1000.00', 'Foo.1000.00' ], + [ 'Bar.01', 'Bar.01' ], + [ 'Bar.010', 'Bar.010' ], + [ null, '' ], + [ null, ' ' ] + ]; + } + + /** + * @covers IP::toHex + * @dataProvider provideToHex + */ + public function testToHex( $expected, $input ) { + $result = IP::toHex( $input ); + $this->assertTrue( $result === false || is_string( $result ) ); + $this->assertEquals( $expected, $result ); + } + + /** + * Provider for IP::testToHex() + */ + public static function provideToHex() { + return [ + [ '00000001', '0.0.0.1' ], + [ '01020304', '1.2.3.4' ], + [ '7F000001', '127.0.0.1' ], + [ '80000000', '128.0.0.0' ], + [ 'DEADCAFE', '222.173.202.254' ], + [ 'FFFFFFFF', '255.255.255.255' ], + [ '8D000BFD', '141.000.11.253' ], + [ false, 'IN.VA.LI.D' ], + [ 'v6-00000000000000000000000000000001', '::1' ], + [ 'v6-20010DB885A3000000008A2E03707334', '2001:0db8:85a3:0000:0000:8a2e:0370:7334' ], + [ 'v6-20010DB885A3000000008A2E03707334', '2001:db8:85a3::8a2e:0370:7334' ], + [ false, 'IN:VA::LI:D' ], + [ false, ':::1' ] + ]; + } + + /** + * @covers IP::isPublic + * @dataProvider provideIsPublic + */ + public function testIsPublic( $expected, $input ) { + $result = IP::isPublic( $input ); + $this->assertEquals( $expected, $result ); + } + + /** + * Provider for IP::testIsPublic() + */ + public static function provideIsPublic() { + return [ + [ false, 'fc00::3' ], # RFC 4193 (local) + [ false, 'fc00::ff' ], # RFC 4193 (local) + [ false, '127.1.2.3' ], # loopback + [ false, '::1' ], # loopback + [ false, 'fe80::1' ], # link-local + [ false, '169.254.1.1' ], # link-local + [ false, '10.0.0.1' ], # RFC 1918 (private) + [ false, '172.16.0.1' ], # RFC 1918 (private) + [ false, '192.168.0.1' ], # RFC 1918 (private) + [ true, '2001:5c0:1000:a::133' ], # public + [ true, 'fc::3' ], # public + [ true, '00FC::' ] # public + ]; + } + + // Private wrapper used to test CIDR Parsing. + private function assertFalseCIDR( $CIDR, $msg = '' ) { + $ff = [ false, false ]; + $this->assertEquals( $ff, IP::parseCIDR( $CIDR ), $msg ); + } + + // Private wrapper to test network shifting using only dot notation + private function assertNet( $expected, $CIDR ) { + $parse = IP::parseCIDR( $CIDR ); + $this->assertEquals( $expected, long2ip( $parse[0] ), "network shifting $CIDR" ); + } + + /** + * @covers IP::hexToQuad + * @dataProvider provideIPsAndHexes + */ + public function testHexToQuad( $ip, $hex ) { + $this->assertEquals( $ip, IP::hexToQuad( $hex ) ); + } + + /** + * Provide some IP addresses and their equivalent hex representations + */ + public function provideIPsandHexes() { + return [ + [ '0.0.0.1', '00000001' ], + [ '255.0.0.0', 'FF000000' ], + [ '255.255.255.255', 'FFFFFFFF' ], + [ '10.188.222.255', '0ABCDEFF' ], + // hex not left-padded... + [ '0.0.0.0', '0' ], + [ '0.0.0.1', '1' ], + [ '0.0.0.255', 'FF' ], + [ '0.0.255.0', 'FF00' ], + ]; + } + + /** + * @covers IP::hexToOctet + * @dataProvider provideOctetsAndHexes + */ + public function testHexToOctet( $octet, $hex ) { + $this->assertEquals( $octet, IP::hexToOctet( $hex ) ); + } + + /** + * Provide some hex and octet representations of the same IPs + */ + public function provideOctetsAndHexes() { + return [ + [ '0:0:0:0:0:0:0:1', '00000000000000000000000000000001' ], + [ '0:0:0:0:0:0:FF:3', '00000000000000000000000000FF0003' ], + [ '0:0:0:0:0:0:FF00:6', '000000000000000000000000FF000006' ], + [ '0:0:0:0:0:0:FCCF:FAFF', '000000000000000000000000FCCFFAFF' ], + [ 'FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF', 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' ], + // hex not left-padded... + [ '0:0:0:0:0:0:0:0', '0' ], + [ '0:0:0:0:0:0:0:1', '1' ], + [ '0:0:0:0:0:0:0:FF', 'FF' ], + [ '0:0:0:0:0:0:0:FFD0', 'FFD0' ], + [ '0:0:0:0:0:0:FA00:0', 'FA000000' ], + [ '0:0:0:0:0:0:FCCF:FAFF', 'FCCFFAFF' ], + ]; + } + + /** + * IP::parseCIDR() returns an array containing a signed IP address + * representing the network mask and the bit mask. + * @covers IP::parseCIDR + */ + public function testCIDRParsing() { + $this->assertFalseCIDR( '192.0.2.0', "missing mask" ); + $this->assertFalseCIDR( '192.0.2.0/', "missing bitmask" ); + + // Verify if statement + $this->assertFalseCIDR( '256.0.0.0/32', "invalid net" ); + $this->assertFalseCIDR( '192.0.2.0/AA', "mask not numeric" ); + $this->assertFalseCIDR( '192.0.2.0/-1', "mask < 0" ); + $this->assertFalseCIDR( '192.0.2.0/33', "mask > 32" ); + + // Check internal logic + # 0 mask always result in array(0,0) + $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '192.0.0.2/0' ) ); + $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '0.0.0.0/0' ) ); + $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '255.255.255.255/0' ) ); + + // @todo FIXME: Add more tests. + + # This part test network shifting + $this->assertNet( '192.0.0.0', '192.0.0.2/24' ); + $this->assertNet( '192.168.5.0', '192.168.5.13/24' ); + $this->assertNet( '10.0.0.160', '10.0.0.161/28' ); + $this->assertNet( '10.0.0.0', '10.0.0.3/28' ); + $this->assertNet( '10.0.0.0', '10.0.0.3/30' ); + $this->assertNet( '10.0.0.4', '10.0.0.4/30' ); + $this->assertNet( '172.17.32.0', '172.17.35.48/21' ); + $this->assertNet( '10.128.0.0', '10.135.0.0/9' ); + $this->assertNet( '134.0.0.0', '134.0.5.1/8' ); + } + + /** + * @covers IP::canonicalize + */ + public function testIPCanonicalizeOnValidIp() { + $this->assertEquals( '192.0.2.152', IP::canonicalize( '192.0.2.152' ), + 'Canonicalization of a valid IP returns it unchanged' ); + } + + /** + * @covers IP::canonicalize + */ + public function testIPCanonicalizeMappedAddress() { + $this->assertEquals( + '192.0.2.152', + IP::canonicalize( '::ffff:192.0.2.152' ) + ); + $this->assertEquals( + '192.0.2.152', + IP::canonicalize( '::192.0.2.152' ) + ); + } + + /** + * Issues there are most probably from IP::toHex() or IP::parseRange() + * @covers IP::isInRange + * @dataProvider provideIPsAndRanges + */ + public function testIPIsInRange( $expected, $addr, $range, $message = '' ) { + $this->assertEquals( + $expected, + IP::isInRange( $addr, $range ), + $message + ); + } + + /** Provider for testIPIsInRange() */ + public static function provideIPsAndRanges() { + # Format: (expected boolean, address, range, optional message) + return [ + # IPv4 + [ true, '192.0.2.0', '192.0.2.0/24', 'Network address' ], + [ true, '192.0.2.77', '192.0.2.0/24', 'Simple address' ], + [ true, '192.0.2.255', '192.0.2.0/24', 'Broadcast address' ], + + [ false, '0.0.0.0', '192.0.2.0/24' ], + [ false, '255.255.255', '192.0.2.0/24' ], + + # IPv6 + [ false, '::1', '2001:DB8::/32' ], + [ false, '::', '2001:DB8::/32' ], + [ false, 'FE80::1', '2001:DB8::/32' ], + + [ true, '2001:DB8::', '2001:DB8::/32' ], + [ true, '2001:0DB8::', '2001:DB8::/32' ], + [ true, '2001:DB8::1', '2001:DB8::/32' ], + [ true, '2001:0DB8::1', '2001:DB8::/32' ], + [ true, '2001:0DB8:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF', + '2001:DB8::/32' ], + + [ false, '2001:0DB8:F::', '2001:DB8::/96' ], + ]; + } + + /** + * Test for IP::splitHostAndPort(). + * @dataProvider provideSplitHostAndPort + */ + public function testSplitHostAndPort( $expected, $input, $description ) { + $this->assertEquals( $expected, IP::splitHostAndPort( $input ), $description ); + } + + /** + * Provider for IP::splitHostAndPort() + */ + public static function provideSplitHostAndPort() { + return [ + [ false, '[', 'Unclosed square bracket' ], + [ false, '[::', 'Unclosed square bracket 2' ], + [ [ '::', false ], '::', 'Bare IPv6 0' ], + [ [ '::1', false ], '::1', 'Bare IPv6 1' ], + [ [ '::', false ], '[::]', 'Bracketed IPv6 0' ], + [ [ '::1', false ], '[::1]', 'Bracketed IPv6 1' ], + [ [ '::1', 80 ], '[::1]:80', 'Bracketed IPv6 with port' ], + [ false, '::x', 'Double colon but no IPv6' ], + [ [ 'x', 80 ], 'x:80', 'Hostname and port' ], + [ false, 'x:x', 'Hostname and invalid port' ], + [ [ 'x', false ], 'x', 'Plain hostname' ] + ]; + } + + /** + * Test for IP::combineHostAndPort() + * @dataProvider provideCombineHostAndPort + */ + public function testCombineHostAndPort( $expected, $input, $description ) { + list( $host, $port, $defaultPort ) = $input; + $this->assertEquals( + $expected, + IP::combineHostAndPort( $host, $port, $defaultPort ), + $description ); + } + + /** + * Provider for IP::combineHostAndPort() + */ + public static function provideCombineHostAndPort() { + return [ + [ '[::1]', [ '::1', 2, 2 ], 'IPv6 default port' ], + [ '[::1]:2', [ '::1', 2, 3 ], 'IPv6 non-default port' ], + [ 'x', [ 'x', 2, 2 ], 'Normal default port' ], + [ 'x:2', [ 'x', 2, 3 ], 'Normal non-default port' ], + ]; + } + + /** + * Test for IP::sanitizeRange() + * @dataProvider provideIPCIDRs + */ + public function testSanitizeRange( $input, $expected, $description ) { + $this->assertEquals( $expected, IP::sanitizeRange( $input ), $description ); + } + + /** + * Provider for IP::testSanitizeRange() + */ + public static function provideIPCIDRs() { + return [ + [ '35.56.31.252/16', '35.56.0.0/16', 'IPv4 range' ], + [ '135.16.21.252/24', '135.16.21.0/24', 'IPv4 range' ], + [ '5.36.71.252/32', '5.36.71.252/32', 'IPv4 silly range' ], + [ '5.36.71.252', '5.36.71.252', 'IPv4 non-range' ], + [ '0:1:2:3:4:c5:f6:7/96', '0:1:2:3:4:C5:0:0/96', 'IPv6 range' ], + [ '0:1:2:3:4:5:6:7/120', '0:1:2:3:4:5:6:0/120', 'IPv6 range' ], + [ '0:e1:2:3:4:5:e6:7/128', '0:E1:2:3:4:5:E6:7/128', 'IPv6 silly range' ], + [ '0:c1:A2:3:4:5:c6:7', '0:C1:A2:3:4:5:C6:7', 'IPv6 non range' ], + ]; + } + + /** + * Test for IP::prettifyIP() + * @dataProvider provideIPsToPrettify + */ + public function testPrettifyIP( $ip, $prettified ) { + $this->assertEquals( $prettified, IP::prettifyIP( $ip ), "Prettify of $ip" ); + } + + /** + * Provider for IP::testPrettifyIP() + */ + public static function provideIPsToPrettify() { + return [ + [ '0:0:0:0:0:0:0:0', '::' ], + [ '0:0:0::0:0:0', '::' ], + [ '0:0:0:1:0:0:0:0', '0:0:0:1::' ], + [ '0:0::f', '::f' ], + [ '0::0:0:0:33:fef:b', '::33:fef:b' ], + [ '3f:535:0:0:0:0:e:fbb', '3f:535::e:fbb' ], + [ '0:0:fef:0:0:0:e:fbb', '0:0:fef::e:fbb' ], + [ 'abbc:2004::0:0:0:0', 'abbc:2004::' ], + [ 'cebc:2004:f:0:0:0:0:0', 'cebc:2004:f::' ], + [ '0:0:0:0:0:0:0:0/16', '::/16' ], + [ '0:0:0::0:0:0/64', '::/64' ], + [ '0:0::f/52', '::f/52' ], + [ '::0:0:33:fef:b/52', '::33:fef:b/52' ], + [ '3f:535:0:0:0:0:e:fbb/48', '3f:535::e:fbb/48' ], + [ '0:0:fef:0:0:0:e:fbb/96', '0:0:fef::e:fbb/96' ], + [ 'abbc:2004:0:0::0:0/40', 'abbc:2004::/40' ], + [ 'aebc:2004:f:0:0:0:0:0/80', 'aebc:2004:f::/80' ], + ]; + } +} diff --git a/tests/phpunit/includes/libs/MemoizedCallableTest.php b/tests/phpunit/includes/libs/MemoizedCallableTest.php index 6eb96b157e..881f5e1167 100644 --- a/tests/phpunit/includes/libs/MemoizedCallableTest.php +++ b/tests/phpunit/includes/libs/MemoizedCallableTest.php @@ -1,7 +1,7 @@ getMock( 'stdClass', [ 'computeSomething' ] ); diff --git a/tests/phpunit/includes/libs/SamplingStatsdClientTest.php b/tests/phpunit/includes/libs/SamplingStatsdClientTest.php index 1ebe55110f..9a489303a7 100644 --- a/tests/phpunit/includes/libs/SamplingStatsdClientTest.php +++ b/tests/phpunit/includes/libs/SamplingStatsdClientTest.php @@ -32,12 +32,35 @@ class SamplingStatsdClientTest extends PHPUnit_Framework_TestCase { return [ // $data, $sampleRate, $seed, $expectWrite - [ $unsampled, 1, 0 /*0.44*/, $unsampled ], - [ $sampled, 1, 0 /*0.44*/, null ], - [ $sampled, 1, 4 /*0.03*/, $sampled ], - [ $unsampled, 0.1, 4 /*0.03*/, $sampled ], - [ $sampled, 0.5, 0 /*0.44*/, null ], - [ $sampled, 0.5, 4 /*0.03*/, $sampled ], + [ $unsampled, 1, 0 /*0.44*/, true ], + [ $sampled, 1, 0 /*0.44*/, false ], + [ $sampled, 1, 4 /*0.03*/, true ], + [ $unsampled, 0.1, 0 /*0.44*/, false ], + [ $sampled, 0.5, 0 /*0.44*/, false ], + [ $sampled, 0.5, 4 /*0.03*/, false ], ]; } + + public function testSetSamplingRates() { + $matching = new StatsdData(); + $matching->setKey( 'foo.bar' ); + $matching->setValue( 1 ); + + $nonMatching = new StatsdData(); + $nonMatching->setKey( 'oof.bar' ); + $nonMatching->setValue( 1 ); + + $sender = $this->getMock( 'Liuggio\StatsdClient\Sender\SenderInterface' ); + $sender->expects( $this->any() )->method( 'open' )->will( $this->returnValue( true ) ); + $sender->expects( $this->once() )->method( 'write' )->with( $this->anything(), + $this->equalTo( $nonMatching ) ); + + $client = new SamplingStatsdClient( $sender ); + $client->setSamplingRates( [ 'foo.*' => 0.2 ] ); + + mt_srand( 0 ); // next random is 0.44 + $client->send( $matching ); + mt_srand( 0 ); + $client->send( $nonMatching ); + } } diff --git a/tests/phpunit/includes/libs/composer/ComposerJsonTest.php b/tests/phpunit/includes/libs/composer/ComposerJsonTest.php index 2072752d67..ded5f8fe09 100644 --- a/tests/phpunit/includes/libs/composer/ComposerJsonTest.php +++ b/tests/phpunit/includes/libs/composer/ComposerJsonTest.php @@ -11,23 +11,8 @@ class ComposerJsonTest extends MediaWikiTestCase { $this->json2 = "$IP/tests/phpunit/data/composer/new-composer.json"; } - public static function provideGetHash() { - return [ - [ 'json', 'cc6e7fc565b246cb30b0cac103a2b31e' ], - [ 'json2', '19921dd1fc457f1b00561da932432001' ], - ]; - } - - /** - * @dataProvider provideGetHash - * @covers ComposerJson::getHash - */ - public function testIsHashUpToDate( $file, $expected ) { - $json = new ComposerJson( $this->$file ); - $this->assertEquals( $expected, $json->getHash() ); - } - /** + * @covers ComposerJson::__construct * @covers ComposerJson::getRequiredDependencies */ public function testGetRequiredDependencies() { diff --git a/tests/phpunit/includes/libs/composer/ComposerLockTest.php b/tests/phpunit/includes/libs/composer/ComposerLockTest.php index 75eb62caa8..eef7e274a2 100644 --- a/tests/phpunit/includes/libs/composer/ComposerLockTest.php +++ b/tests/phpunit/includes/libs/composer/ComposerLockTest.php @@ -11,14 +11,7 @@ class ComposerLockTest extends MediaWikiTestCase { } /** - * @covers ComposerLock::getHash - */ - public function testGetHash() { - $lock = new ComposerLock( $this->lock ); - $this->assertEquals( 'a3bb80b0ac4c4a31e52574d48c032923', $lock->getHash() ); - } - - /** + * @covers ComposerLock::__construct * @covers ComposerLock::getInstalledDependencies */ public function testGetInstalledDependencies() { diff --git a/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php b/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php new file mode 100644 index 0000000000..85927a393d --- /dev/null +++ b/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php @@ -0,0 +1,62 @@ +mimeAnalyzer = new MimeAnalyzer( [ + 'infoFile' => $IP . "/includes/libs/mime/mime.info", + 'typeFile' => $IP . "/includes/libs/mime/mime.types", + 'xmlTypes' => [ + 'http://www.w3.org/2000/svg:svg' => 'image/svg+xml', + 'svg' => 'image/svg+xml', + 'http://www.lysator.liu.se/~alla/dia/:diagram' => 'application/x-dia-diagram', + 'http://www.w3.org/1999/xhtml:html' => 'text/html', // application/xhtml+xml? + 'html' => 'text/html', // application/xhtml+xml? + ] + ] ); + parent::setUp(); + } + + /** + * @dataProvider providerImproveTypeFromExtension + * @param string $ext File extension (no leading dot) + * @param string $oldMime Initially detected MIME + * @param string $expectedMime MIME type after taking extension into account + */ + function testImproveTypeFromExtension( $ext, $oldMime, $expectedMime ) { + $actualMime = $this->mimeAnalyzer->improveTypeFromExtension( $oldMime, $ext ); + $this->assertEquals( $expectedMime, $actualMime ); + } + + function providerImproveTypeFromExtension() { + return [ + [ 'gif', 'image/gif', 'image/gif' ], + [ 'gif', 'unknown/unknown', 'unknown/unknown' ], + [ 'wrl', 'unknown/unknown', 'model/vrml' ], + [ 'txt', 'text/plain', 'text/plain' ], + [ 'csv', 'text/plain', 'text/csv' ], + [ 'tsv', 'text/plain', 'text/tab-separated-values' ], + [ 'js', 'text/javascript', 'application/javascript' ], + [ 'js', 'application/x-javascript', 'application/javascript' ], + [ 'json', 'text/plain', 'application/json' ], + [ 'foo', 'application/x-opc+zip', 'application/zip' ], + [ 'docx', 'application/x-opc+zip', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' ], + [ 'djvu', 'image/x-djvu', 'image/vnd.djvu' ], + [ 'wav', 'audio/wav', 'audio/wav' ], + ]; + } + + /** + * Test to make sure that encoder=ffmpeg2theora doesn't trigger + * MEDIATYPE_VIDEO (bug 63584) + */ + function testOggRecognize() { + $oggFile = __DIR__ . '/../../../data/media/say-test.ogg'; + $actualType = $this->mimeAnalyzer->getMediaType( $oggFile, 'application/ogg' ); + $this->assertEquals( $actualType, MEDIATYPE_AUDIO ); + } +} diff --git a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php index 92fb95418c..a1afa77726 100644 --- a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php +++ b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php @@ -1,4 +1,7 @@ * @group BagOStuff @@ -251,20 +254,20 @@ class BagOStuffTest extends MediaWikiTestCase { $value1 = $this->cache->getScopedLock( $key, 0 ); $value2 = $this->cache->getScopedLock( $key, 0 ); - $this->assertType( 'ScopedCallback', $value1, 'First call returned lock' ); + $this->assertType( ScopedCallback::class, $value1, 'First call returned lock' ); $this->assertNull( $value2, 'Duplicate call returned no lock' ); unset( $value1 ); $value3 = $this->cache->getScopedLock( $key, 0 ); - $this->assertType( 'ScopedCallback', $value3, 'Lock returned callback after release' ); + $this->assertType( ScopedCallback::class, $value3, 'Lock returned callback after release' ); unset( $value3 ); $value1 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' ); $value2 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' ); - $this->assertType( 'ScopedCallback', $value1, 'First reentrant call returned lock' ); - $this->assertType( 'ScopedCallback', $value1, 'Second reentrant call returned lock' ); + $this->assertType( ScopedCallback::class, $value1, 'First reentrant call returned lock' ); + $this->assertType( ScopedCallback::class, $value1, 'Second reentrant call returned lock' ); } /** diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php index 35005f5c6a..aa46c966ad 100644 --- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php +++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php @@ -1,6 +1,6 @@ getCliArg( 'use-wanobjectcache' ) ) { - $name = $this->getCliArg( 'use-wanobjectcache' ); - - $this->cache = ObjectCache::getWANInstance( $name ); - } else { - $this->cache = new WANObjectCache( [ - 'cache' => new HashBagOStuff(), - 'pool' => 'testcache-hash', - 'relayer' => new EventRelayerNull( [] ) - ] ); - } + $this->cache = new WANObjectCache( [ + 'cache' => new HashBagOStuff(), + 'pool' => 'testcache-hash', + 'relayer' => new EventRelayerNull( [] ) + ] ); $wanCache = TestingAccessWrapper::newFromObject( $this->cache ); + /** @noinspection PhpUndefinedFieldInspection */ $this->internalCache = $wanCache->cache; } @@ -29,13 +24,14 @@ class WANObjectCacheTest extends MediaWikiTestCase { * @dataProvider provideSetAndGet * @covers WANObjectCache::set() * @covers WANObjectCache::get() + * @covers WANObjectCache::makeKey() * @param mixed $value * @param integer $ttl */ public function testSetAndGet( $value, $ttl ) { $curTTL = null; $asOf = null; - $key = wfRandomString(); + $key = $this->cache->makeKey( 'x', wfRandomString() ); $this->cache->get( $key, $curTTL, [], $asOf ); $this->assertNull( $curTTL, "Current TTL is null" ); @@ -71,9 +67,10 @@ class WANObjectCacheTest extends MediaWikiTestCase { /** * @covers WANObjectCache::get() + * @covers WANObjectCache::makeGlobalKey() */ public function testGetNotExists() { - $key = wfRandomString(); + $key = $this->cache->makeGlobalKey( 'y', wfRandomString(), 'p' ); $curTTL = null; $value = $this->cache->get( $key, $curTTL ); @@ -105,6 +102,60 @@ class WANObjectCacheTest extends MediaWikiTestCase { $this->assertFalse( $this->cache->get( $key ), "Stale set() value ignored" ); } + public function testProcessCache() { + $hit = 0; + $callback = function () use ( &$hit ) { + ++$hit; + return 42; + }; + $keys = [ wfRandomString(), wfRandomString(), wfRandomString() ]; + $groups = [ 'thiscache:1', 'thatcache:1', 'somecache:1' ]; + + foreach ( $keys as $i => $key ) { + $this->cache->getWithSetCallback( + $key, 100, $callback, [ 'pcTTL' => 5, 'pcGroup' => $groups[$i] ] ); + } + $this->assertEquals( 3, $hit ); + + foreach ( $keys as $i => $key ) { + $this->cache->getWithSetCallback( + $key, 100, $callback, [ 'pcTTL' => 5, 'pcGroup' => $groups[$i] ] ); + } + $this->assertEquals( 3, $hit, "Values cached" ); + + foreach ( $keys as $i => $key ) { + $this->cache->getWithSetCallback( + "$key-2", 100, $callback, [ 'pcTTL' => 5, 'pcGroup' => $groups[$i] ] ); + } + $this->assertEquals( 6, $hit ); + + foreach ( $keys as $i => $key ) { + $this->cache->getWithSetCallback( + "$key-2", 100, $callback, [ 'pcTTL' => 5, 'pcGroup' => $groups[$i] ] ); + } + $this->assertEquals( 6, $hit, "New values cached" ); + + foreach ( $keys as $i => $key ) { + $this->cache->delete( $key ); + $this->cache->getWithSetCallback( + $key, 100, $callback, [ 'pcTTL' => 5, 'pcGroup' => $groups[$i] ] ); + } + $this->assertEquals( 9, $hit, "Values evicted" ); + + $key = reset( $keys ); + // Get into cache + $this->cache->getWithSetCallback( $key, 100, $callback, [ 'pcTTL' => 5 ] ); + $this->cache->getWithSetCallback( $key, 100, $callback, [ 'pcTTL' => 5 ] ); + $this->assertEquals( 10, $hit, "Value cached" ); + $outerCallback = function () use ( &$callback, $key ) { + $v = $this->cache->getWithSetCallback( $key, 100, $callback, [ 'pcTTL' => 5 ] ); + + return 43 + $v; + }; + $this->cache->getWithSetCallback( $key, 100, $outerCallback ); + $this->assertEquals( 11, $hit, "Nested callback value process cache skipped" ); + } + /** * @dataProvider getWithSetCallback_provider * @covers WANObjectCache::getWithSetCallback() @@ -120,9 +171,15 @@ class WANObjectCacheTest extends MediaWikiTestCase { $cKey1 = wfRandomString(); $cKey2 = wfRandomString(); + $priorValue = null; + $priorAsOf = null; $wasSet = 0; - $func = function( $old, &$ttl ) use ( &$wasSet, $value ) { + $func = function( $old, &$ttl, &$opts, $asOf ) + use ( &$wasSet, &$priorValue, &$priorAsOf, $value ) + { ++$wasSet; + $priorValue = $old; + $priorAsOf = $asOf; $ttl = 20; // override with another value return $value; }; @@ -131,6 +188,8 @@ class WANObjectCacheTest extends MediaWikiTestCase { $v = $cache->getWithSetCallback( $key, 30, $func, [ 'lockTSE' => 5 ] + $extOpts ); $this->assertEquals( $value, $v, "Value returned" ); $this->assertEquals( 1, $wasSet, "Value regenerated" ); + $this->assertFalse( $priorValue, "No prior value" ); + $this->assertNull( $priorAsOf, "No prior value" ); $curTTL = null; $cache->get( $key, $curTTL ); @@ -139,9 +198,9 @@ class WANObjectCacheTest extends MediaWikiTestCase { $wasSet = 0; $v = $cache->getWithSetCallback( $key, 30, $func, [ - 'lowTTL' => 0, - 'lockTSE' => 5, - ] + $extOpts ); + 'lowTTL' => 0, + 'lockTSE' => 5, + ] + $extOpts ); $this->assertEquals( $value, $v, "Value returned" ); $this->assertEquals( 0, $wasSet, "Value not regenerated" ); @@ -153,6 +212,8 @@ class WANObjectCacheTest extends MediaWikiTestCase { ); $this->assertEquals( $value, $v, "Value returned" ); $this->assertEquals( 1, $wasSet, "Value regenerated due to check keys" ); + $this->assertEquals( $value, $priorValue, "Has prior value" ); + $this->assertInternalType( 'float', $priorAsOf, "Has prior value" ); $t1 = $cache->getCheckKeyTime( $cKey1 ); $this->assertGreaterThanOrEqual( $priorTime, $t1, 'Check keys generated on miss' ); $t2 = $cache->getCheckKeyTime( $cKey2 ); @@ -196,6 +257,150 @@ class WANObjectCacheTest extends MediaWikiTestCase { ]; } + /** + * @dataProvider getMultiWithSetCallback_provider + * @covers WANObjectCache::getMultiWithSetCallback() + * @covers WANObjectCache::makeMultiKeys() + * @param array $extOpts + * @param bool $versioned + */ + public function testGetMultiWithSetCallback( array $extOpts, $versioned ) { + $cache = $this->cache; + + $keyA = wfRandomString(); + $keyB = wfRandomString(); + $keyC = wfRandomString(); + $cKey1 = wfRandomString(); + $cKey2 = wfRandomString(); + + $priorValue = null; + $priorAsOf = null; + $wasSet = 0; + $genFunc = function ( $id, $old, &$ttl, &$opts, $asOf ) use ( + &$wasSet, &$priorValue, &$priorAsOf + ) { + ++$wasSet; + $priorValue = $old; + $priorAsOf = $asOf; + $ttl = 20; // override with another value + return "@$id$"; + }; + + $wasSet = 0; + $keyedIds = new ArrayIterator( [ $keyA => 3353 ] ); + $value = "@3353$"; + $v = $cache->getMultiWithSetCallback( + $keyedIds, 30, $genFunc, [ 'lockTSE' => 5 ] + $extOpts ); + $this->assertEquals( $value, $v[$keyA], "Value returned" ); + $this->assertEquals( 1, $wasSet, "Value regenerated" ); + $this->assertFalse( $priorValue, "No prior value" ); + $this->assertNull( $priorAsOf, "No prior value" ); + + $curTTL = null; + $cache->get( $keyA, $curTTL ); + $this->assertLessThanOrEqual( 20, $curTTL, 'Current TTL between 19-20 (overriden)' ); + $this->assertGreaterThanOrEqual( 19, $curTTL, 'Current TTL between 19-20 (overriden)' ); + + $wasSet = 0; + $value = "@efef$"; + $keyedIds = new ArrayIterator( [ $keyB => 'efef' ] ); + $v = $cache->getMultiWithSetCallback( + $keyedIds, 30, $genFunc, [ 'lowTTL' => 0, 'lockTSE' => 5, ] + $extOpts ); + $this->assertEquals( $value, $v[$keyB], "Value returned" ); + $this->assertEquals( 1, $wasSet, "Value regenerated" ); + $v = $cache->getMultiWithSetCallback( + $keyedIds, 30, $genFunc, [ 'lowTTL' => 0, 'lockTSE' => 5, ] + $extOpts ); + $this->assertEquals( $value, $v[$keyB], "Value returned" ); + $this->assertEquals( 1, $wasSet, "Value not regenerated" ); + + $priorTime = microtime( true ); + usleep( 1 ); + $wasSet = 0; + $keyedIds = new ArrayIterator( [ $keyB => 'efef' ] ); + $v = $cache->getMultiWithSetCallback( + $keyedIds, 30, $genFunc, [ 'checkKeys' => [ $cKey1, $cKey2 ] ] + $extOpts + ); + $this->assertEquals( $value, $v[$keyB], "Value returned" ); + $this->assertEquals( 1, $wasSet, "Value regenerated due to check keys" ); + $this->assertEquals( $value, $priorValue, "Has prior value" ); + $this->assertInternalType( 'float', $priorAsOf, "Has prior value" ); + $t1 = $cache->getCheckKeyTime( $cKey1 ); + $this->assertGreaterThanOrEqual( $priorTime, $t1, 'Check keys generated on miss' ); + $t2 = $cache->getCheckKeyTime( $cKey2 ); + $this->assertGreaterThanOrEqual( $priorTime, $t2, 'Check keys generated on miss' ); + + $priorTime = microtime( true ); + $value = "@43636$"; + $wasSet = 0; + $keyedIds = new ArrayIterator( [ $keyC => 43636 ] ); + $v = $cache->getMultiWithSetCallback( + $keyedIds, 30, $genFunc, [ 'checkKeys' => [ $cKey1, $cKey2 ] ] + $extOpts + ); + $this->assertEquals( $value, $v[$keyC], "Value returned" ); + $this->assertEquals( 1, $wasSet, "Value regenerated due to still-recent check keys" ); + $t1 = $cache->getCheckKeyTime( $cKey1 ); + $this->assertLessThanOrEqual( $priorTime, $t1, 'Check keys did not change again' ); + $t2 = $cache->getCheckKeyTime( $cKey2 ); + $this->assertLessThanOrEqual( $priorTime, $t2, 'Check keys did not change again' ); + + $curTTL = null; + $v = $cache->get( $keyC, $curTTL, [ $cKey1, $cKey2 ] ); + if ( $versioned ) { + $this->assertEquals( $value, $v[$cache::VFLD_DATA], "Value returned" ); + } else { + $this->assertEquals( $value, $v, "Value returned" ); + } + $this->assertLessThanOrEqual( 0, $curTTL, "Value has current TTL < 0 due to check keys" ); + + $wasSet = 0; + $key = wfRandomString(); + $keyedIds = new ArrayIterator( [ $key => 242424 ] ); + $v = $cache->getMultiWithSetCallback( + $keyedIds, 30, $genFunc, [ 'pcTTL' => 5 ] + $extOpts ); + $this->assertEquals( "@{$keyedIds[$key]}$", $v[$key], "Value returned" ); + $cache->delete( $key ); + $keyedIds = new ArrayIterator( [ $key => 242424 ] ); + $v = $cache->getMultiWithSetCallback( + $keyedIds, 30, $genFunc, [ 'pcTTL' => 5 ] + $extOpts ); + $this->assertEquals( "@{$keyedIds[$key]}$", $v[$key], "Value still returned after deleted" ); + $this->assertEquals( 1, $wasSet, "Value process cached while deleted" ); + + $calls = 0; + $ids = [ 1, 2, 3, 4, 5, 6 ]; + $keyFunc = function ( $id, WANObjectCache $wanCache ) { + return $wanCache->makeKey( 'test', $id ); + }; + $keyedIds = $cache->makeMultiKeys( $ids, $keyFunc ); + $genFunc = function ( $id, $oldValue, &$ttl, array &$setops ) use ( &$calls ) { + ++$calls; + + return "val-{$id}"; + }; + $values = $cache->getMultiWithSetCallback( $keyedIds, 10, $genFunc ); + + $this->assertEquals( + [ "val-1", "val-2", "val-3", "val-4", "val-5", "val-6" ], + array_values( $values ), + "Correct values in correct order" + ); + $this->assertEquals( + array_map( $keyFunc, $ids, array_fill( 0, count( $ids ), $this->cache ) ), + array_keys( $values ), + "Correct keys in correct order" + ); + $this->assertEquals( count( $ids ), $calls ); + + $cache->getMultiWithSetCallback( $keyedIds, 10, $genFunc ); + $this->assertEquals( count( $ids ), $calls, "Values cached" ); + } + + public static function getMultiWithSetCallback_provider() { + return [ + [ [], false ], + [ [ 'version' => 1 ], true ] + ]; + } + /** * @covers WANObjectCache::getWithSetCallback() * @covers WANObjectCache::doGetWithSetCallback() @@ -722,4 +927,37 @@ class WANObjectCacheTest extends MediaWikiTestCase { $wanCache->getWithSetCallback( 'p', 30, $valFunc ); $wanCache->getCheckKeyTime( 'zzz' ); } + + /** + * @dataProvider provideAdaptiveTTL + * @covers WANObjectCache::adaptiveTTL() + * @param float|int $ago + * @param int $maxTTL + * @param int $minTTL + * @param float $factor + * @param int $adaptiveTTL + */ + public function testAdaptiveTTL( $ago, $maxTTL, $minTTL, $factor, $adaptiveTTL ) { + $mtime = $ago ? time() - $ago : $ago; + $margin = 5; + $ttl = $this->cache->adaptiveTTL( $mtime, $maxTTL, $minTTL, $factor ); + + $this->assertGreaterThanOrEqual( $adaptiveTTL - $margin, $ttl ); + $this->assertLessThanOrEqual( $adaptiveTTL + $margin, $ttl ); + + $ttl = $this->cache->adaptiveTTL( (string)$mtime, $maxTTL, $minTTL, $factor ); + + $this->assertGreaterThanOrEqual( $adaptiveTTL - $margin, $ttl ); + $this->assertLessThanOrEqual( $adaptiveTTL + $margin, $ttl ); + } + + public static function provideAdaptiveTTL() { + return [ + [ 3600, 900, 30, .2, 720 ], + [ 3600, 500, 30, .2, 500 ], + [ 3600, 86400, 800, .2, 800 ], + [ false, 86400, 800, .2, 800 ], + [ null, 86400, 800, .2, 800 ] + ]; + } } diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php new file mode 100644 index 0000000000..d13fbf9341 --- /dev/null +++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php @@ -0,0 +1,69 @@ +setExpectedException( InvalidArgumentException::class ); + } + + $domain = new DatabaseDomain( $db, $schema, $prefix ); + $this->assertInstanceOf( DatabaseDomain::class, $domain ); + $this->assertEquals( $db, $domain->getDatabase() ); + $this->assertEquals( $schema, $domain->getSchema() ); + $this->assertEquals( $prefix, $domain->getTablePrefix() ); + $this->assertEquals( $id, $domain->getId() ); + } + + public static function provideNewFromId() { + return [ + // basic + [ 'foo', 'foo', null, '' ], + // - + [ 'foo-bar', 'foo', null, 'bar' ], + [ 'foo-bar-baz', 'foo', 'bar', 'baz' ], + // ?h -> - + [ 'foo?hbar-baz-baa', 'foo-bar', 'baz', 'baa' ], + // ?? -> ? + [ 'foo??bar-baz-baa', 'foo?bar', 'baz', 'baa' ], + // ? is left alone + [ 'foo?bar-baz-baa', 'foo?bar', 'baz', 'baa' ], + // too many parts + [ 'foo-bar-baz-baa', '', '', '', true ], + ]; + } + + /** + * @dataProvider provideNewFromId + */ + public function testNewFromId( $id, $db, $schema, $prefix, $exception = false ) { + if ( $exception ) { + $this->setExpectedException( InvalidArgumentException::class ); + } + $domain = DatabaseDomain::newFromId( $id ); + $this->assertInstanceOf( DatabaseDomain::class, $domain ); + $this->assertEquals( $db, $domain->getDatabase() ); + $this->assertEquals( $schema, $domain->getSchema() ); + $this->assertEquals( $prefix, $domain->getTablePrefix() ); + } +} diff --git a/tests/phpunit/includes/libs/time/ConvertibleTimestampTest.php b/tests/phpunit/includes/libs/time/ConvertibleTimestampTest.php new file mode 100644 index 0000000000..d48caf37f0 --- /dev/null +++ b/tests/phpunit/includes/libs/time/ConvertibleTimestampTest.php @@ -0,0 +1,144 @@ +assertInternalType( 'string', $timestamp->getTimestamp() ); + $this->assertNotEmpty( $timestamp->getTimestamp() ); + $this->assertNotEquals( false, strtotime( $timestamp->getTimestamp( TS_MW ) ) ); + } + + /** + * @covers ConvertibleTimestamp::__toString + */ + public function testToString() { + $timestamp = new ConvertibleTimestamp( '1406833268' ); // Equivalent to 20140731190108 + $this->assertEquals( '1406833268', $timestamp->__toString() ); + } + + public static function provideValidTimestampDifferences() { + return [ + [ '1406833268', '1406833269', '00 00 00 01' ], + [ '1406833268', '1406833329', '00 00 01 01' ], + [ '1406833268', '1406836929', '00 01 01 01' ], + [ '1406833268', '1406923329', '01 01 01 01' ], + ]; + } + + /** + * @dataProvider provideValidTimestampDifferences + * @covers ConvertibleTimestamp::diff + */ + public function testDiff( $timestamp1, $timestamp2, $expected ) { + $timestamp1 = new ConvertibleTimestamp( $timestamp1 ); + $timestamp2 = new ConvertibleTimestamp( $timestamp2 ); + $diff = $timestamp1->diff( $timestamp2 ); + $this->assertEquals( $expected, $diff->format( '%D %H %I %S' ) ); + } + + /** + * Test parsing of valid timestamps and outputing to MW format. + * @dataProvider provideValidTimestamps + * @covers ConvertibleTimestamp::getTimestamp + */ + public function testValidParse( $format, $original, $expected ) { + $timestamp = new ConvertibleTimestamp( $original ); + $this->assertEquals( $expected, $timestamp->getTimestamp( TS_MW ) ); + } + + /** + * Test outputting valid timestamps to different formats. + * @dataProvider provideValidTimestamps + * @covers ConvertibleTimestamp::getTimestamp + */ + public function testValidOutput( $format, $expected, $original ) { + $timestamp = new ConvertibleTimestamp( $original ); + $this->assertEquals( $expected, (string)$timestamp->getTimestamp( $format ) ); + } + + /** + * Test an invalid timestamp. + * @expectedException TimestampException + * @covers ConvertibleTimestamp + */ + public function testInvalidParse() { + new ConvertibleTimestamp( "This is not a timestamp." ); + } + + /** + * @dataProvider provideValidTimestamps + * @covers ConvertibleTimestamp::convert + */ + public function testConvert( $format, $expected, $original ) { + $this->assertSame( $expected, ConvertibleTimestamp::convert( $format, $original ) ); + } + + /** + * Format an invalid timestamp. + * @covers ConvertibleTimestamp::convert + */ + public function testConvertInvalid() { + $this->assertSame( false, ConvertibleTimestamp::convert( 'Not a timestamp', 0 ) ); + } + + /** + * Test an out of range timestamp + * @dataProvider provideOutOfRangeTimestamps + * @expectedException TimestampException + * @covers ConvertibleTimestamp + */ + public function testOutOfRangeTimestamps( $format, $input ) { + $timestamp = new ConvertibleTimestamp( $input ); + $timestamp->getTimestamp( $format ); + } + + /** + * Test requesting an invalid output format. + * @expectedException TimestampException + * @covers ConvertibleTimestamp::getTimestamp + */ + public function testInvalidOutput() { + $timestamp = new ConvertibleTimestamp( '1343761268' ); + $timestamp->getTimestamp( 98 ); + } + + /** + * Returns a list of valid timestamps in the format: + * [ type, timestamp_of_type, timestamp_in_MW ] + */ + public static function provideValidTimestamps() { + return [ + // Various formats + [ TS_UNIX, '1343761268', '20120731190108' ], + [ TS_MW, '20120731190108', '20120731190108' ], + [ TS_DB, '2012-07-31 19:01:08', '20120731190108' ], + [ TS_ISO_8601, '2012-07-31T19:01:08Z', '20120731190108' ], + [ TS_ISO_8601_BASIC, '20120731T190108Z', '20120731190108' ], + [ TS_EXIF, '2012:07:31 19:01:08', '20120731190108' ], + [ TS_RFC2822, 'Tue, 31 Jul 2012 19:01:08 GMT', '20120731190108' ], + [ TS_ORACLE, '31-07-2012 19:01:08.000000', '20120731190108' ], + [ TS_POSTGRES, '2012-07-31 19:01:08 GMT', '20120731190108' ], + // Some extremes and weird values + [ TS_ISO_8601, '9999-12-31T23:59:59Z', '99991231235959' ], + [ TS_UNIX, '-62135596801', '00001231235959' ] + ]; + } + + /** + * Returns a list of out of range timestamps in the format: + * [ type, timestamp_of_type ] + */ + public static function provideOutOfRangeTimestamps() { + return [ + // Various formats + [ TS_MW, '-62167219201' ], // -0001-12-31T23:59:59Z + [ TS_MW, '253402300800' ], // 10000-01-01T00:00:00Z + ]; + } +} diff --git a/tests/phpunit/includes/libs/xmp/XMPTest.php b/tests/phpunit/includes/libs/xmp/XMPTest.php new file mode 100644 index 0000000000..ac52a39ffe --- /dev/null +++ b/tests/phpunit/includes/libs/xmp/XMPTest.php @@ -0,0 +1,226 @@ +markTestSkipped( "PHP extension 'exif' is not loaded, skipping." ); + } + } + + /** + * Put XMP in, compare what comes out... + * + * @param string $xmp The actual xml data. + * @param array $expected Expected result of parsing the xmp. + * @param string $info Short sentence on what's being tested. + * + * @throws Exception + * @dataProvider provideXMPParse + * + * @covers XMPReader::parse + */ + public function testXMPParse( $xmp, $expected, $info ) { + if ( !is_string( $xmp ) || !is_array( $expected ) ) { + throw new Exception( "Invalid data provided to " . __METHOD__ ); + } + $reader = new XMPReader; + $reader->parse( $xmp ); + $this->assertEquals( $expected, $reader->getResults(), $info, 0.0000000001 ); + } + + public static function provideXMPParse() { + $xmpPath = __DIR__ . '/../../../data/xmp/'; + $data = []; + + // $xmpFiles format: array of arrays with first arg file base name, + // with the actual file having .xmp on the end for the xmp + // and .result.php on the end for a php file containing the result + // array. Second argument is some info on what's being tested. + $xmpFiles = [ + [ '1', 'parseType=Resource test' ], + [ '2', 'Structure with mixed attribute and element props' ], + [ '3', 'Extra qualifiers (that should be ignored)' ], + [ '3-invalid', 'Test ignoring qualifiers that look like normal props' ], + [ '4', 'Flash as qualifier' ], + [ '5', 'Flash as qualifier 2' ], + [ '6', 'Multiple rdf:Description' ], + [ '7', 'Generic test of several property types' ], + [ 'flash', 'Test of Flash property' ], + [ 'invalid-child-not-struct', 'Test child props not in struct or ignored' ], + [ 'no-recognized-props', 'Test namespace and no recognized props' ], + [ 'no-namespace', 'Test non-namespaced attributes are ignored' ], + [ 'bag-for-seq', "Allow bag's instead of seq's. (bug 27105)" ], + [ 'utf16BE', 'UTF-16BE encoding' ], + [ 'utf16LE', 'UTF-16LE encoding' ], + [ 'utf32BE', 'UTF-32BE encoding' ], + [ 'utf32LE', 'UTF-32LE encoding' ], + [ 'xmpExt', 'Extended XMP missing second part' ], + [ 'gps', 'Handling of exif GPS parameters in XMP' ], + ]; + + $xmpFiles[] = [ 'doctype-included', 'XMP includes doctype' ]; + + foreach ( $xmpFiles as $file ) { + $xmp = file_get_contents( $xmpPath . $file[0] . '.xmp' ); + // I'm not sure if this is the best way to handle getting the + // result array, but it seems kind of big to put directly in the test + // file. + $result = null; + include $xmpPath . $file[0] . '.result.php'; + $data[] = [ $xmp, $result, '[' . $file[0] . '.xmp] ' . $file[1] ]; + } + + return $data; + } + + /** Test ExtendedXMP block support. (Used when the XMP has to be split + * over multiple jpeg segments, due to 64k size limit on jpeg segments. + * + * @todo This is based on what the standard says. Need to find a real + * world example file to double check the support for this is right. + * + * @covers XMPReader::parseExtended + */ + public function testExtendedXMP() { + $xmpPath = __DIR__ . '/../../../data/xmp/'; + $standardXMP = file_get_contents( $xmpPath . 'xmpExt.xmp' ); + $extendedXMP = file_get_contents( $xmpPath . 'xmpExt2.xmp' ); + + $md5sum = '28C74E0AC2D796886759006FBE2E57B7'; // of xmpExt2.xmp + $length = pack( 'N', strlen( $extendedXMP ) ); + $offset = pack( 'N', 0 ); + $extendedPacket = $md5sum . $length . $offset . $extendedXMP; + + $reader = new XMPReader(); + $reader->parse( $standardXMP ); + $reader->parseExtended( $extendedPacket ); + $actual = $reader->getResults(); + + $expected = [ + 'xmp-exif' => [ + 'DigitalZoomRatio' => '0/10', + 'Flash' => 9, + 'FNumber' => '2/10', + ] + ]; + + $this->assertEquals( $expected, $actual ); + } + + /** + * This test has an extended XMP block with a wrong guid (md5sum) + * and thus should only return the StandardXMP, not the ExtendedXMP. + * + * @covers XMPReader::parseExtended + */ + public function testExtendedXMPWithWrongGUID() { + $xmpPath = __DIR__ . '/../../../data/xmp/'; + $standardXMP = file_get_contents( $xmpPath . 'xmpExt.xmp' ); + $extendedXMP = file_get_contents( $xmpPath . 'xmpExt2.xmp' ); + + $md5sum = '28C74E0AC2D796886759006FBE2E57B9'; // Note last digit. + $length = pack( 'N', strlen( $extendedXMP ) ); + $offset = pack( 'N', 0 ); + $extendedPacket = $md5sum . $length . $offset . $extendedXMP; + + $reader = new XMPReader(); + $reader->parse( $standardXMP ); + $reader->parseExtended( $extendedPacket ); + $actual = $reader->getResults(); + + $expected = [ + 'xmp-exif' => [ + 'DigitalZoomRatio' => '0/10', + 'Flash' => 9, + ] + ]; + + $this->assertEquals( $expected, $actual ); + } + + /** + * Have a high offset to simulate a missing packet, + * which should cause it to ignore the ExtendedXMP packet. + * + * @covers XMPReader::parseExtended + */ + public function testExtendedXMPMissingPacket() { + $xmpPath = __DIR__ . '/../../../data/xmp/'; + $standardXMP = file_get_contents( $xmpPath . 'xmpExt.xmp' ); + $extendedXMP = file_get_contents( $xmpPath . 'xmpExt2.xmp' ); + + $md5sum = '28C74E0AC2D796886759006FBE2E57B7'; // of xmpExt2.xmp + $length = pack( 'N', strlen( $extendedXMP ) ); + $offset = pack( 'N', 2048 ); + $extendedPacket = $md5sum . $length . $offset . $extendedXMP; + + $reader = new XMPReader(); + $reader->parse( $standardXMP ); + $reader->parseExtended( $extendedPacket ); + $actual = $reader->getResults(); + + $expected = [ + 'xmp-exif' => [ + 'DigitalZoomRatio' => '0/10', + 'Flash' => 9, + ] + ]; + + $this->assertEquals( $expected, $actual ); + } + + /** + * Test for multi-section, hostile XML + * @covers XMPReader::checkParseSafety + */ + public function testCheckParseSafety() { + + // Test for detection + $xmpPath = __DIR__ . '/../../../data/xmp/'; + $file = fopen( $xmpPath . 'doctype-included.xmp', 'rb' ); + $valid = false; + $reader = new XMPReader(); + do { + $chunk = fread( $file, 10 ); + $valid = $reader->parse( $chunk, feof( $file ) ); + } while ( !feof( $file ) ); + $this->assertFalse( $valid, 'Check that doctype is detected in fragmented XML' ); + $this->assertEquals( + [], + $reader->getResults(), + 'Check that doctype is detected in fragmented XML' + ); + fclose( $file ); + unset( $reader ); + + // Test for false positives + $file = fopen( $xmpPath . 'doctype-not-included.xmp', 'rb' ); + $valid = false; + $reader = new XMPReader(); + do { + $chunk = fread( $file, 10 ); + $valid = $reader->parse( $chunk, feof( $file ) ); + } while ( !feof( $file ) ); + $this->assertTrue( + $valid, + 'Check for false-positive detecting doctype in fragmented XML' + ); + $this->assertEquals( + [ + 'xmp-exif' => [ + 'DigitalZoomRatio' => '0/10', + 'Flash' => '9' + ] + ], + $reader->getResults(), + 'Check that doctype is detected in fragmented XML' + ); + } +} diff --git a/tests/phpunit/includes/libs/xmp/XMPValidateTest.php b/tests/phpunit/includes/libs/xmp/XMPValidateTest.php new file mode 100644 index 0000000000..7f7ea930e2 --- /dev/null +++ b/tests/phpunit/includes/libs/xmp/XMPValidateTest.php @@ -0,0 +1,53 @@ +validateDate( [], $value, true ); + $this->assertEquals( $expected, $value ); + } + + public static function provideDates() { + /* For reference valid date formats are: + * YYYY + * YYYY-MM + * YYYY-MM-DD + * YYYY-MM-DDThh:mmTZD + * YYYY-MM-DDThh:mm:ssTZD + * YYYY-MM-DDThh:mm:ss.sTZD + * (Time zone is optional) + */ + return [ + [ '1992', '1992' ], + [ '1992-04', '1992:04' ], + [ '1992-02-01', '1992:02:01' ], + [ '2011-09-29', '2011:09:29' ], + [ '1982-12-15T20:12', '1982:12:15 20:12' ], + [ '1982-12-15T20:12Z', '1982:12:15 20:12' ], + [ '1982-12-15T20:12+02:30', '1982:12:15 22:42' ], + [ '1982-12-15T01:12-02:30', '1982:12:14 22:42' ], + [ '1982-12-15T20:12:11', '1982:12:15 20:12:11' ], + [ '1982-12-15T20:12:11Z', '1982:12:15 20:12:11' ], + [ '1982-12-15T20:12:11+01:10', '1982:12:15 21:22:11' ], + [ '2045-12-15T20:12:11', '2045:12:15 20:12:11' ], + [ '1867-06-01T15:00:00', '1867:06:01 15:00:00' ], + /* some invalid ones */ + [ '2001--12', null ], + [ '2001-5-12', null ], + [ '2001-5-12TZ', null ], + [ '2001-05-12T15', null ], + [ '2001-12T15:13', null ], + ]; + } +} diff --git a/tests/phpunit/includes/linker/LinkRendererTest.php b/tests/phpunit/includes/linker/LinkRendererTest.php index 91789c53b5..6d096c208b 100644 --- a/tests/phpunit/includes/linker/LinkRendererTest.php +++ b/tests/phpunit/includes/linker/LinkRendererTest.php @@ -24,7 +24,6 @@ class LinkRendererTest extends MediaWikiLangTestCase { 'wgScript' => '/w/index.php', ] ); $this->factory = MediaWikiServices::getInstance()->getLinkRendererFactory(); - } public function testMergeAttribs() { @@ -135,8 +134,9 @@ class LinkRendererTest extends MediaWikiLangTestCase { } public function testGetLinkClasses() { + $wanCache = ObjectCache::getMainWANInstance(); $titleFormatter = MediaWikiServices::getInstance()->getTitleFormatter(); - $linkCache = new LinkCache( $titleFormatter ); + $linkCache = new LinkCache( $titleFormatter, $wanCache ); $foobarTitle = new TitleValue( NS_MAIN, 'FooBar' ); $redirectTitle = new TitleValue( NS_MAIN, 'Redirect' ); $userTitle = new TitleValue( NS_USER, 'Someuser' ); diff --git a/tests/phpunit/includes/logging/LogFormatterTestCase.php b/tests/phpunit/includes/logging/LogFormatterTestCase.php index b09e5b1847..c289839b49 100644 --- a/tests/phpunit/includes/logging/LogFormatterTestCase.php +++ b/tests/phpunit/includes/logging/LogFormatterTestCase.php @@ -50,7 +50,7 @@ abstract class LogFormatterTestCase extends MediaWikiLangTestCase { private static function removeSomeHtml( $html ) { $html = str_replace( '"', '"', $html ); $html = preg_replace( '/\xE2\x80[\x8E\x8F]/', '', $html ); // Strip lrm/rlm - return trim( preg_replace( '/<(a|span)[^>]*>([^<]*)<\/\1>/', '$2', $html ) ); + return trim( strip_tags( $html ) ); } private static function removeApiMetaData( $val ) { diff --git a/tests/phpunit/includes/media/ExifBitmapTest.php b/tests/phpunit/includes/media/ExifBitmapTest.php index f70b42de42..47ed67bdb1 100644 --- a/tests/phpunit/includes/media/ExifBitmapTest.php +++ b/tests/phpunit/includes/media/ExifBitmapTest.php @@ -17,7 +17,6 @@ class ExifBitmapTest extends MediaWikiMediaTestCase { $this->setMwGlobals( 'wgShowEXIF', true ); $this->handler = new ExifBitmapHandler; - } /** diff --git a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php index 5042121ccc..e854ab57f7 100644 --- a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php +++ b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php @@ -26,7 +26,8 @@ abstract class MediaWikiMediaTestCase extends MediaWikiTestCase { $this->backend = new FSFileBackend( [ 'name' => 'localtesting', 'wikiId' => wfWikiID(), - 'containerPaths' => $containers + 'containerPaths' => $containers, + 'tmpDirectory' => $this->getNewTempDirectory() ] ); $this->repo = new FSRepo( $this->getRepoOptions() ); } diff --git a/tests/phpunit/includes/media/XMPTest.php b/tests/phpunit/includes/media/XMPTest.php deleted file mode 100644 index bffe415c5d..0000000000 --- a/tests/phpunit/includes/media/XMPTest.php +++ /dev/null @@ -1,223 +0,0 @@ -checkPHPExtension( 'exif' ); # Requires libxml to do XMP parsing - } - - /** - * Put XMP in, compare what comes out... - * - * @param string $xmp The actual xml data. - * @param array $expected Expected result of parsing the xmp. - * @param string $info Short sentence on what's being tested. - * - * @throws Exception - * @dataProvider provideXMPParse - * - * @covers XMPReader::parse - */ - public function testXMPParse( $xmp, $expected, $info ) { - if ( !is_string( $xmp ) || !is_array( $expected ) ) { - throw new Exception( "Invalid data provided to " . __METHOD__ ); - } - $reader = new XMPReader; - $reader->parse( $xmp ); - $this->assertEquals( $expected, $reader->getResults(), $info, 0.0000000001 ); - } - - public static function provideXMPParse() { - $xmpPath = __DIR__ . '/../../data/xmp/'; - $data = []; - - // $xmpFiles format: array of arrays with first arg file base name, - // with the actual file having .xmp on the end for the xmp - // and .result.php on the end for a php file containing the result - // array. Second argument is some info on what's being tested. - $xmpFiles = [ - [ '1', 'parseType=Resource test' ], - [ '2', 'Structure with mixed attribute and element props' ], - [ '3', 'Extra qualifiers (that should be ignored)' ], - [ '3-invalid', 'Test ignoring qualifiers that look like normal props' ], - [ '4', 'Flash as qualifier' ], - [ '5', 'Flash as qualifier 2' ], - [ '6', 'Multiple rdf:Description' ], - [ '7', 'Generic test of several property types' ], - [ 'flash', 'Test of Flash property' ], - [ 'invalid-child-not-struct', 'Test child props not in struct or ignored' ], - [ 'no-recognized-props', 'Test namespace and no recognized props' ], - [ 'no-namespace', 'Test non-namespaced attributes are ignored' ], - [ 'bag-for-seq', "Allow bag's instead of seq's. (bug 27105)" ], - [ 'utf16BE', 'UTF-16BE encoding' ], - [ 'utf16LE', 'UTF-16LE encoding' ], - [ 'utf32BE', 'UTF-32BE encoding' ], - [ 'utf32LE', 'UTF-32LE encoding' ], - [ 'xmpExt', 'Extended XMP missing second part' ], - [ 'gps', 'Handling of exif GPS parameters in XMP' ], - ]; - - $xmpFiles[] = [ 'doctype-included', 'XMP includes doctype' ]; - - foreach ( $xmpFiles as $file ) { - $xmp = file_get_contents( $xmpPath . $file[0] . '.xmp' ); - // I'm not sure if this is the best way to handle getting the - // result array, but it seems kind of big to put directly in the test - // file. - $result = null; - include $xmpPath . $file[0] . '.result.php'; - $data[] = [ $xmp, $result, '[' . $file[0] . '.xmp] ' . $file[1] ]; - } - - return $data; - } - - /** Test ExtendedXMP block support. (Used when the XMP has to be split - * over multiple jpeg segments, due to 64k size limit on jpeg segments. - * - * @todo This is based on what the standard says. Need to find a real - * world example file to double check the support for this is right. - * - * @covers XMPReader::parseExtended - */ - public function testExtendedXMP() { - $xmpPath = __DIR__ . '/../../data/xmp/'; - $standardXMP = file_get_contents( $xmpPath . 'xmpExt.xmp' ); - $extendedXMP = file_get_contents( $xmpPath . 'xmpExt2.xmp' ); - - $md5sum = '28C74E0AC2D796886759006FBE2E57B7'; // of xmpExt2.xmp - $length = pack( 'N', strlen( $extendedXMP ) ); - $offset = pack( 'N', 0 ); - $extendedPacket = $md5sum . $length . $offset . $extendedXMP; - - $reader = new XMPReader(); - $reader->parse( $standardXMP ); - $reader->parseExtended( $extendedPacket ); - $actual = $reader->getResults(); - - $expected = [ - 'xmp-exif' => [ - 'DigitalZoomRatio' => '0/10', - 'Flash' => 9, - 'FNumber' => '2/10', - ] - ]; - - $this->assertEquals( $expected, $actual ); - } - - /** - * This test has an extended XMP block with a wrong guid (md5sum) - * and thus should only return the StandardXMP, not the ExtendedXMP. - * - * @covers XMPReader::parseExtended - */ - public function testExtendedXMPWithWrongGUID() { - $xmpPath = __DIR__ . '/../../data/xmp/'; - $standardXMP = file_get_contents( $xmpPath . 'xmpExt.xmp' ); - $extendedXMP = file_get_contents( $xmpPath . 'xmpExt2.xmp' ); - - $md5sum = '28C74E0AC2D796886759006FBE2E57B9'; // Note last digit. - $length = pack( 'N', strlen( $extendedXMP ) ); - $offset = pack( 'N', 0 ); - $extendedPacket = $md5sum . $length . $offset . $extendedXMP; - - $reader = new XMPReader(); - $reader->parse( $standardXMP ); - $reader->parseExtended( $extendedPacket ); - $actual = $reader->getResults(); - - $expected = [ - 'xmp-exif' => [ - 'DigitalZoomRatio' => '0/10', - 'Flash' => 9, - ] - ]; - - $this->assertEquals( $expected, $actual ); - } - - /** - * Have a high offset to simulate a missing packet, - * which should cause it to ignore the ExtendedXMP packet. - * - * @covers XMPReader::parseExtended - */ - public function testExtendedXMPMissingPacket() { - $xmpPath = __DIR__ . '/../../data/xmp/'; - $standardXMP = file_get_contents( $xmpPath . 'xmpExt.xmp' ); - $extendedXMP = file_get_contents( $xmpPath . 'xmpExt2.xmp' ); - - $md5sum = '28C74E0AC2D796886759006FBE2E57B7'; // of xmpExt2.xmp - $length = pack( 'N', strlen( $extendedXMP ) ); - $offset = pack( 'N', 2048 ); - $extendedPacket = $md5sum . $length . $offset . $extendedXMP; - - $reader = new XMPReader(); - $reader->parse( $standardXMP ); - $reader->parseExtended( $extendedPacket ); - $actual = $reader->getResults(); - - $expected = [ - 'xmp-exif' => [ - 'DigitalZoomRatio' => '0/10', - 'Flash' => 9, - ] - ]; - - $this->assertEquals( $expected, $actual ); - } - - /** - * Test for multi-section, hostile XML - * @covers XMPReader::checkParseSafety - */ - public function testCheckParseSafety() { - - // Test for detection - $xmpPath = __DIR__ . '/../../data/xmp/'; - $file = fopen( $xmpPath . 'doctype-included.xmp', 'rb' ); - $valid = false; - $reader = new XMPReader(); - do { - $chunk = fread( $file, 10 ); - $valid = $reader->parse( $chunk, feof( $file ) ); - } while ( !feof( $file ) ); - $this->assertFalse( $valid, 'Check that doctype is detected in fragmented XML' ); - $this->assertEquals( - [], - $reader->getResults(), - 'Check that doctype is detected in fragmented XML' - ); - fclose( $file ); - unset( $reader ); - - // Test for false positives - $file = fopen( $xmpPath . 'doctype-not-included.xmp', 'rb' ); - $valid = false; - $reader = new XMPReader(); - do { - $chunk = fread( $file, 10 ); - $valid = $reader->parse( $chunk, feof( $file ) ); - } while ( !feof( $file ) ); - $this->assertTrue( - $valid, - 'Check for false-positive detecting doctype in fragmented XML' - ); - $this->assertEquals( - [ - 'xmp-exif' => [ - 'DigitalZoomRatio' => '0/10', - 'Flash' => '9' - ] - ], - $reader->getResults(), - 'Check that doctype is detected in fragmented XML' - ); - } -} diff --git a/tests/phpunit/includes/media/XMPValidateTest.php b/tests/phpunit/includes/media/XMPValidateTest.php deleted file mode 100644 index 6a006295df..0000000000 --- a/tests/phpunit/includes/media/XMPValidateTest.php +++ /dev/null @@ -1,53 +0,0 @@ -validateDate( [], $value, true ); - $this->assertEquals( $expected, $value ); - } - - public static function provideDates() { - /* For reference valid date formats are: - * YYYY - * YYYY-MM - * YYYY-MM-DD - * YYYY-MM-DDThh:mmTZD - * YYYY-MM-DDThh:mm:ssTZD - * YYYY-MM-DDThh:mm:ss.sTZD - * (Time zone is optional) - */ - return [ - [ '1992', '1992' ], - [ '1992-04', '1992:04' ], - [ '1992-02-01', '1992:02:01' ], - [ '2011-09-29', '2011:09:29' ], - [ '1982-12-15T20:12', '1982:12:15 20:12' ], - [ '1982-12-15T20:12Z', '1982:12:15 20:12' ], - [ '1982-12-15T20:12+02:30', '1982:12:15 22:42' ], - [ '1982-12-15T01:12-02:30', '1982:12:14 22:42' ], - [ '1982-12-15T20:12:11', '1982:12:15 20:12:11' ], - [ '1982-12-15T20:12:11Z', '1982:12:15 20:12:11' ], - [ '1982-12-15T20:12:11+01:10', '1982:12:15 21:22:11' ], - [ '2045-12-15T20:12:11', '2045:12:15 20:12:11' ], - [ '1867-06-01T15:00:00', '1867:06:01 15:00:00' ], - /* some invalid ones */ - [ '2001--12', null ], - [ '2001-5-12', null ], - [ '2001-5-12TZ', null ], - [ '2001-05-12T15', null ], - [ '2001-12T15:13', null ], - ]; - } -} diff --git a/tests/phpunit/includes/page/WikiCategoryPageTest.php b/tests/phpunit/includes/page/WikiCategoryPageTest.php index 9f4e1fabbb..5f1bf0ca79 100644 --- a/tests/phpunit/includes/page/WikiCategoryPageTest.php +++ b/tests/phpunit/includes/page/WikiCategoryPageTest.php @@ -1,5 +1,7 @@ newPage( "WikiPageTest_testDoEditContent" ); @@ -154,6 +157,7 @@ class WikiPageTest extends MediaWikiLangTestCase { /** * @covers WikiPage::doEdit + * @deprecated since 1.21. Should be removed when WikiPage::doEdit() gets removed */ public function testDoEdit() { $this->hideDeprecated( "WikiPage::doEdit" ); @@ -212,30 +216,6 @@ class WikiPageTest extends MediaWikiLangTestCase { $this->assertEquals( 2, $n, 'pagelinks should contain two links from the page' ); } - /** - * @covers WikiPage::doQuickEditContent - */ - public function testDoQuickEditContent() { - global $wgUser; - - $page = $this->createPage( - "WikiPageTest_testDoQuickEditContent", - "original text", - CONTENT_MODEL_WIKITEXT - ); - - $content = ContentHandler::makeContent( - "quick text", - $page->getTitle(), - CONTENT_MODEL_WIKITEXT - ); - $page->doQuickEditContent( $content, $wgUser, "testing q" ); - - # --------------------- - $page = new WikiPage( $page->getTitle() ); - $this->assertTrue( $content->equals( $page->getContent() ) ); - } - /** * @covers WikiPage::doDeleteArticle */ diff --git a/tests/phpunit/includes/pager/ReverseChronologicalPagerTest.php b/tests/phpunit/includes/pager/ReverseChronologicalPagerTest.php new file mode 100644 index 0000000000..fc5d660274 --- /dev/null +++ b/tests/phpunit/includes/pager/ReverseChronologicalPagerTest.php @@ -0,0 +1,69 @@ + + */ +class ReverseChronologicalPagerTest extends MediaWikiLangTestCase { + + /** + * @covers ReverseChronologicalPager::getDateCond + */ + public function testGetDateCond() { + $pager = $this->getMockForAbstractClass( 'ReverseChronologicalPager' ); + $timestamp = MWTimestamp::getInstance(); + $db = wfGetDB( DB_MASTER ); + + $currYear = $timestamp->format( 'Y' ); + $currMonth = $timestamp->format( 'n' ); + + // Test that getDateCond sets and returns mOffset + $this->assertEquals( $pager->getDateCond( 2006, 6 ), $pager->mOffset ); + + // Test year and month + $pager->getDateCond( 2006, 6 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( '20060701000000' ) ); + + // Test year, month, and day + $pager->getDateCond( 2006, 6, 5 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( '20060606000000' ) ); + + // Test month overflow into the next year + $pager->getDateCond( 2006, 12 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( '20070101000000' ) ); + + // Test day overflow to the next month + $pager->getDateCond( 2006, 6, 30 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( '20060701000000' ) ); + + // Test invalid month (should use end of year) + $pager->getDateCond( 2006, -1 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( '20070101000000' ) ); + + // Test invalid day (should use end of month) + $pager->getDateCond( 2006, 6, 1337 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( '20060701000000' ) ); + + // Test last day of year + $pager->getDateCond( 2006, 12, 31 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( '20070101000000' ) ); + + // Test invalid day that overflows to next year + $pager->getDateCond( 2006, 12, 32 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( '20070101000000' ) ); + + // Test month past current month (should use previous year) + if ( $currMonth < 5 ) { + $pager->getDateCond( -1, 5 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( $currYear - 1 . '0601000000' ) ); + } + if ( $currMonth < 12 ) { + $pager->getDateCond( -1, 12 ); + $this->assertEquals( $pager->mOffset, $db->timestamp( $currYear . '0101000000' ) ); + } + } +} + diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php b/tests/phpunit/includes/parser/MediaWikiParserTest.php deleted file mode 100644 index 173447fcf7..0000000000 --- a/tests/phpunit/includes/parser/MediaWikiParserTest.php +++ /dev/null @@ -1,138 +0,0 @@ - "\\'", '\\' => '\\\\' ] ); - $parserTestClassName = ucfirst( $testsName ); - - // Official spec for class names: http://php.net/manual/en/language.oop5.basic.php - // Prepend 'ParserTest_' to be paranoid about it not starting with a number - $parserTestClassName = 'ParserTest_' . - preg_replace( '/[^a-zA-Z0-9_\x7f-\xff]/', '_', $parserTestClassName ); - - if ( isset( $testList[$parserTestClassName] ) ) { - // If a conflict happens, gives a very unclear fatal. - // So as a last ditch effort to prevent that eventuality, if there - // is a conflict, append a number. - $counter++; - $parserTestClassName .= $counter; - } - $testList[$parserTestClassName] = true; - $parserTestClassDefinition = <<addTestSuite( $parserTestClassName ); - } - return $suite; - } - - /** - * Write $msg under log group 'tests-parser' - * @param string $msg Message to log - */ - protected static function debug( $msg ) { - return wfDebugLog( 'tests-parser', wfGetCaller() . ' ' . $msg ); - } -} diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php deleted file mode 100644 index e7abd15e8b..0000000000 --- a/tests/phpunit/includes/parser/NewParserTest.php +++ /dev/null @@ -1,1132 +0,0 @@ -getCliArg( 'regex' ) ) { - $this->regex = $this->getCliArg( 'regex' ); - } else { - # Matches anything - $this->regex = ''; - } - - $this->keepUploads = $this->getCliArg( 'keep-uploads' ); - - $tmpGlobals = []; - - $tmpGlobals['wgLanguageCode'] = 'en'; - $tmpGlobals['wgContLang'] = Language::factory( 'en' ); - $tmpGlobals['wgSitename'] = 'MediaWiki'; - $tmpGlobals['wgServer'] = 'http://example.org'; - $tmpGlobals['wgServerName'] = 'example.org'; - $tmpGlobals['wgScriptPath'] = ''; - $tmpGlobals['wgScript'] = '/index.php'; - $tmpGlobals['wgResourceBasePath'] = ''; - $tmpGlobals['wgStylePath'] = '/skins'; - $tmpGlobals['wgExtensionAssetsPath'] = '/extensions'; - $tmpGlobals['wgArticlePath'] = '/wiki/$1'; - $tmpGlobals['wgActionPaths'] = []; - $tmpGlobals['wgVariantArticlePath'] = false; - $tmpGlobals['wgEnableUploads'] = true; - $tmpGlobals['wgUploadNavigationUrl'] = false; - $tmpGlobals['wgThumbnailScriptPath'] = false; - $tmpGlobals['wgLocalFileRepo'] = [ - 'class' => 'LocalRepo', - 'name' => 'local', - 'url' => 'http://example.com/images', - 'hashLevels' => 2, - 'transformVia404' => false, - 'backend' => 'local-backend' - ]; - $tmpGlobals['wgForeignFileRepos'] = []; - $tmpGlobals['wgDefaultExternalStore'] = []; - $tmpGlobals['wgParserCacheType'] = CACHE_NONE; - $tmpGlobals['wgCapitalLinks'] = true; - $tmpGlobals['wgNoFollowLinks'] = true; - $tmpGlobals['wgNoFollowDomainExceptions'] = [ 'no-nofollow.org' ]; - $tmpGlobals['wgExternalLinkTarget'] = false; - $tmpGlobals['wgThumbnailScriptPath'] = false; - $tmpGlobals['wgUseImageResize'] = true; - $tmpGlobals['wgAllowExternalImages'] = true; - $tmpGlobals['wgRawHtml'] = false; - $tmpGlobals['wgExperimentalHtmlIds'] = false; - $tmpGlobals['wgAdaptiveMessageCache'] = true; - $tmpGlobals['wgUseDatabaseMessages'] = true; - $tmpGlobals['wgLocaltimezone'] = 'UTC'; - $tmpGlobals['wgGroupPermissions'] = [ - '*' => [ - 'createaccount' => true, - 'read' => true, - 'edit' => true, - 'createpage' => true, - 'createtalk' => true, - ] ]; - $tmpGlobals['wgNamespaceProtection'] = [ NS_MEDIAWIKI => 'editinterface' ]; - - $tmpGlobals['wgParser'] = new StubObject( - 'wgParser', $GLOBALS['wgParserConf']['class'], - [ $GLOBALS['wgParserConf'] ] ); - - $tmpGlobals['wgFileExtensions'][] = 'svg'; - $tmpGlobals['wgSVGConverter'] = 'rsvg'; - $tmpGlobals['wgSVGConverters']['rsvg'] = - '$path/rsvg-convert -w $width -h $height -o $output $input'; - - if ( $GLOBALS['wgStyleDirectory'] === false ) { - $tmpGlobals['wgStyleDirectory'] = "$IP/skins"; - } - - $tmpHooks = $wgHooks; - $tmpHooks['ParserTestParser'][] = 'ParserTestParserHook::setup'; - $tmpHooks['ParserGetVariableValueTs'][] = 'ParserTest::getFakeTimestamp'; - $tmpGlobals['wgHooks'] = $tmpHooks; - # add a namespace shadowing a interwiki link, to test - # proper precedence when resolving links. (bug 51680) - $tmpGlobals['wgExtraNamespaces'] = [ - 100 => 'MemoryAlpha', - 101 => 'MemoryAlpha_talk' - ]; - - $tmpGlobals['wgLocalInterwikis'] = [ 'local', 'mi' ]; - # "extra language links" - # see https://gerrit.wikimedia.org/r/111390 - $tmpGlobals['wgExtraInterlanguageLinkPrefixes'] = [ 'mul' ]; - - // DjVu support - $this->djVuSupport = new DjVuSupport(); - // Tidy support - $this->tidySupport = new TidySupport(); - $tmpGlobals['wgTidyConfig'] = $this->tidySupport->getConfig(); - $tmpGlobals['wgUseTidy'] = false; - - $this->setMwGlobals( $tmpGlobals ); - - $this->savedWeirdGlobals['image_alias'] = $wgNamespaceAliases['Image']; - $this->savedWeirdGlobals['image_talk_alias'] = $wgNamespaceAliases['Image_talk']; - - $wgNamespaceAliases['Image'] = NS_FILE; - $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK; - - MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache - $wgContLang->resetNamespaces(); # reset namespace cache - ParserTest::resetTitleServices(); - MediaWikiServices::getInstance()->disableService( 'MediaHandlerFactory' ); - MediaWikiServices::getInstance()->redefineService( - 'MediaHandlerFactory', - function() { - return new MockMediaHandlerFactory(); - } - ); - } - - protected function tearDown() { - global $wgNamespaceAliases, $wgContLang; - - $wgNamespaceAliases['Image'] = $this->savedWeirdGlobals['image_alias']; - $wgNamespaceAliases['Image_talk'] = $this->savedWeirdGlobals['image_talk_alias']; - - MWTidy::destroySingleton(); - - // Restore backends - RepoGroup::destroySingleton(); - FileBackendGroup::destroySingleton(); - - // Remove temporary pages from the link cache - LinkCache::singleton()->clear(); - - // Restore message cache (temporary pages and $wgUseDatabaseMessages) - MessageCache::destroyInstance(); - MediaWikiServices::getInstance()->resetServiceForTesting( 'MediaHandlerFactory' ); - - parent::tearDown(); - - MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache - $wgContLang->resetNamespaces(); # reset namespace cache - } - - public static function tearDownAfterClass() { - ParserTest::tearDownInterwikis(); - parent::tearDownAfterClass(); - } - - function addDBDataOnce() { - # disabled for performance - # $this->tablesUsed[] = 'image'; - - # Update certain things in site_stats - $this->db->insert( 'site_stats', - [ 'ss_row_id' => 1, 'ss_images' => 2, 'ss_good_articles' => 1 ], - __METHOD__, - [ 'IGNORE' ] - ); - - $user = User::newFromId( 0 ); - LinkCache::singleton()->clear(); # Avoids the odd failure at creating the nullRevision - - # Upload DB table entries for files. - # We will upload the actual files later. Note that if anything causes LocalFile::load() - # to be triggered before then, it will break via maybeUpgrade() setting the fileExists - # member to false and storing it in cache. - # note that the size/width/height/bits/etc of the file - # are actually set by inspecting the file itself; the arguments - # to recordUpload2 have no effect. That said, we try to make things - # match up so it is less confusing to readers of the code & tests. - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Foobar.jpg' ) ); - if ( !$this->db->selectField( 'image', '1', [ 'img_name' => $image->getName() ] ) ) { - $image->recordUpload2( - '', // archive name - 'Upload of some lame file', - 'Some lame file', - [ - 'size' => 7881, - 'width' => 1941, - 'height' => 220, - 'bits' => 8, - 'media_type' => MEDIATYPE_BITMAP, - 'mime' => 'image/jpeg', - 'metadata' => serialize( [] ), - 'sha1' => Wikimedia\base_convert( '1', 16, 36, 31 ), - 'fileExists' => true ], - $this->db->timestamp( '20010115123500' ), $user - ); - } - - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Thumb.png' ) ); - if ( !$this->db->selectField( 'image', '1', [ 'img_name' => $image->getName() ] ) ) { - $image->recordUpload2( - '', // archive name - 'Upload of some lame thumbnail', - 'Some lame thumbnail', - [ - 'size' => 22589, - 'width' => 135, - 'height' => 135, - 'bits' => 8, - 'media_type' => MEDIATYPE_BITMAP, - 'mime' => 'image/png', - 'metadata' => serialize( [] ), - 'sha1' => Wikimedia\base_convert( '2', 16, 36, 31 ), - 'fileExists' => true ], - $this->db->timestamp( '20130225203040' ), $user - ); - } - - # This image will be blacklisted in [[MediaWiki:Bad image list]] - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Bad.jpg' ) ); - if ( !$this->db->selectField( 'image', '1', [ 'img_name' => $image->getName() ] ) ) { - $image->recordUpload2( - '', // archive name - 'zomgnotcensored', - 'Borderline image', - [ - 'size' => 12345, - 'width' => 320, - 'height' => 240, - 'bits' => 24, - 'media_type' => MEDIATYPE_BITMAP, - 'mime' => 'image/jpeg', - 'metadata' => serialize( [] ), - 'sha1' => Wikimedia\base_convert( '3', 16, 36, 31 ), - 'fileExists' => true ], - $this->db->timestamp( '20010115123500' ), $user - ); - } - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Foobar.svg' ) ); - if ( !$this->db->selectField( 'image', '1', [ 'img_name' => $image->getName() ] ) ) { - $image->recordUpload2( '', 'Upload of some lame SVG', 'Some lame SVG', [ - 'size' => 12345, - 'width' => 240, - 'height' => 180, - 'bits' => 0, - 'media_type' => MEDIATYPE_DRAWING, - 'mime' => 'image/svg+xml', - 'metadata' => serialize( [] ), - 'sha1' => Wikimedia\base_convert( '', 16, 36, 31 ), - 'fileExists' => true - ], $this->db->timestamp( '20010115123500' ), $user ); - } - - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Video.ogv' ) ); - if ( !$this->db->selectField( 'image', '1', [ 'img_name' => $image->getName() ] ) ) { - $image->recordUpload2( '', 'A pretty movie', 'Will it play', [ - 'size' => 12345, - 'width' => 320, - 'height' => 240, - 'bits' => 0, - 'media_type' => MEDIATYPE_VIDEO, - 'mime' => 'application/ogg', - 'metadata' => serialize( [] ), - 'sha1' => Wikimedia\base_convert( '', 16, 36, 32 ), - 'fileExists' => true - ], $this->db->timestamp( '20010115123500' ), $user ); - } - - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Audio.oga' ) ); - if ( !$this->db->selectField( 'image', '1', [ 'img_name' => $image->getName() ] ) ) { - $image->recordUpload2( '', 'An awesome hitsong ', 'Will it play', [ - 'size' => 12345, - 'width' => 0, - 'height' => 0, - 'bits' => 0, - 'media_type' => MEDIATYPE_AUDIO, - 'mime' => 'application/ogg', - 'metadata' => serialize( [] ), - 'sha1' => Wikimedia\base_convert( '', 16, 36, 32 ), - 'fileExists' => true - ], $this->db->timestamp( '20010115123500' ), $user ); - } - - # A DjVu file - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'LoremIpsum.djvu' ) ); - if ( !$this->db->selectField( 'image', '1', [ 'img_name' => $image->getName() ] ) ) { - $image->recordUpload2( '', 'Upload a DjVu', 'A DjVu', [ - 'size' => 3249, - 'width' => 2480, - 'height' => 3508, - 'bits' => 0, - 'media_type' => MEDIATYPE_BITMAP, - 'mime' => 'image/vnd.djvu', - 'metadata' => ' - - - - - - - - - -', - 'sha1' => Wikimedia\base_convert( '', 16, 36, 31 ), - 'fileExists' => true - ], $this->db->timestamp( '20140115123600' ), $user ); - } - } - - // ParserTest setup/teardown functions - - /** - * Set up the global variables for a consistent environment for each test. - * Ideally this should replace the global configuration entirely. - * @param array $opts - * @param string $config - * @return RequestContext - */ - protected function setupGlobals( $opts = [], $config = '' ) { - global $wgFileBackends; - # Find out values for some special options. - $lang = - self::getOptionValue( 'language', $opts, 'en' ); - $variant = - self::getOptionValue( 'variant', $opts, false ); - $maxtoclevel = - self::getOptionValue( 'wgMaxTocLevel', $opts, 999 ); - $linkHolderBatchSize = - self::getOptionValue( 'wgLinkHolderBatchSize', $opts, 1000 ); - - $uploadDir = $this->getUploadDir(); - if ( $this->getCliArg( 'use-filebackend' ) ) { - if ( self::$backendToUse ) { - $backend = self::$backendToUse; - } else { - $name = $this->getCliArg( 'use-filebackend' ); - $useConfig = []; - foreach ( $wgFileBackends as $conf ) { - if ( $conf['name'] == $name ) { - $useConfig = $conf; - } - } - $useConfig['name'] = 'local-backend'; // swap name - unset( $useConfig['lockManager'] ); - unset( $useConfig['fileJournal'] ); - $class = $useConfig['class']; - self::$backendToUse = new $class( $useConfig ); - $backend = self::$backendToUse; - } - } else { - # Replace with a mock. We do not care about generating real - # files on the filesystem, just need to expose the file - # informations. - $backend = new MockFileBackend( [ - 'name' => 'local-backend', - 'wikiId' => wfWikiID() - ] ); - } - - $settings = [ - 'wgLocalFileRepo' => [ - 'class' => 'LocalRepo', - 'name' => 'local', - 'url' => 'http://example.com/images', - 'hashLevels' => 2, - 'transformVia404' => false, - 'backend' => $backend - ], - 'wgEnableUploads' => self::getOptionValue( 'wgEnableUploads', $opts, true ), - 'wgLanguageCode' => $lang, - 'wgDBprefix' => $this->db->getType() != 'oracle' ? 'unittest_' : 'ut_', - 'wgRawHtml' => self::getOptionValue( 'wgRawHtml', $opts, false ), - 'wgNamespacesWithSubpages' => [ NS_MAIN => isset( $opts['subpage'] ) ], - 'wgAllowExternalImages' => self::getOptionValue( 'wgAllowExternalImages', $opts, true ), - 'wgThumbLimits' => [ self::getOptionValue( 'thumbsize', $opts, 180 ) ], - 'wgMaxTocLevel' => $maxtoclevel, - 'wgUseTeX' => isset( $opts['math'] ) || isset( $opts['texvc'] ), - 'wgMathDirectory' => $uploadDir . '/math', - 'wgDefaultLanguageVariant' => $variant, - 'wgLinkHolderBatchSize' => $linkHolderBatchSize, - 'wgUseTidy' => false, - 'wgTidyConfig' => isset( $opts['tidy'] ) ? $this->tidySupport->getConfig() : null - ]; - - if ( $config ) { - $configLines = explode( "\n", $config ); - - foreach ( $configLines as $line ) { - list( $var, $value ) = explode( '=', $line, 2 ); - - $settings[$var] = eval( "return $value;" ); // ??? - } - } - - $this->savedGlobals = []; - - /** @since 1.20 */ - Hooks::run( 'ParserTestGlobals', [ &$settings ] ); - - $langObj = Language::factory( $lang ); - $settings['wgContLang'] = $langObj; - $settings['wgLang'] = $langObj; - - $context = new RequestContext(); - $settings['wgOut'] = $context->getOutput(); - $settings['wgUser'] = $context->getUser(); - $settings['wgRequest'] = $context->getRequest(); - - // We (re)set $wgThumbLimits to a single-element array above. - $context->getUser()->setOption( 'thumbsize', 0 ); - - foreach ( $settings as $var => $val ) { - if ( array_key_exists( $var, $GLOBALS ) ) { - $this->savedGlobals[$var] = $GLOBALS[$var]; - } - - $GLOBALS[$var] = $val; - } - - MWTidy::destroySingleton(); - MagicWord::clearCache(); - - # The entries saved into RepoGroup cache with previous globals will be wrong. - RepoGroup::destroySingleton(); - FileBackendGroup::destroySingleton(); - - # Create dummy files in storage - $this->setupUploads(); - - # Publish the articles after we have the final language set - $this->publishTestArticles(); - - MessageCache::destroyInstance(); - - return $context; - } - - /** - * Get an FS upload directory (only applies to FSFileBackend) - * - * @return string The directory - */ - protected function getUploadDir() { - if ( $this->keepUploads ) { - // Don't use getNewTempDirectory() as this is meant to persist - $dir = wfTempDir() . '/mwParser-images'; - - if ( is_dir( $dir ) ) { - return $dir; - } - } else { - $dir = $this->getNewTempDirectory(); - } - - if ( file_exists( $dir ) ) { - wfDebug( "Already exists!\n" ); - - return $dir; - } - - return $dir; - } - - /** - * Create a dummy uploads directory which will contain a couple - * of files in order to pass existence tests. - * - * @return string The directory - */ - protected function setupUploads() { - global $IP; - - $base = $this->getBaseDir(); - $backend = RepoGroup::singleton()->getLocalRepo()->getBackend(); - $backend->prepare( [ 'dir' => "$base/local-public/3/3a" ] ); - $backend->store( [ - 'src' => "$IP/tests/phpunit/data/parser/headbg.jpg", - 'dst' => "$base/local-public/3/3a/Foobar.jpg" - ] ); - $backend->prepare( [ 'dir' => "$base/local-public/e/ea" ] ); - $backend->store( [ - 'src' => "$IP/tests/phpunit/data/parser/wiki.png", - 'dst' => "$base/local-public/e/ea/Thumb.png" - ] ); - $backend->prepare( [ 'dir' => "$base/local-public/0/09" ] ); - $backend->store( [ - 'src' => "$IP/tests/phpunit/data/parser/headbg.jpg", - 'dst' => "$base/local-public/0/09/Bad.jpg" - ] ); - $backend->prepare( [ 'dir' => "$base/local-public/5/5f" ] ); - $backend->store( [ - 'src' => "$IP/tests/phpunit/data/parser/LoremIpsum.djvu", - 'dst' => "$base/local-public/5/5f/LoremIpsum.djvu" - ] ); - - // No helpful SVG file to copy, so make one ourselves - $data = '' . - ''; - - $backend->prepare( [ 'dir' => "$base/local-public/f/ff" ] ); - $backend->quickCreate( [ - 'content' => $data, 'dst' => "$base/local-public/f/ff/Foobar.svg" - ] ); - } - - /** - * Restore default values and perform any necessary clean-up - * after each test runs. - */ - protected function teardownGlobals() { - $this->teardownUploads(); - - foreach ( $this->savedGlobals as $var => $val ) { - $GLOBALS[$var] = $val; - } - } - - /** - * Remove the dummy uploads directory - */ - private function teardownUploads() { - if ( $this->keepUploads ) { - return; - } - - $backend = RepoGroup::singleton()->getLocalRepo()->getBackend(); - if ( $backend instanceof MockFileBackend ) { - # In memory backend, so dont bother cleaning them up. - return; - } - - $base = $this->getBaseDir(); - // delete the files first, then the dirs. - self::deleteFiles( - [ - "$base/local-public/3/3a/Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/1000px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/100px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/120px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/1280px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/137px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/1500px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/177px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/180px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/200px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/206px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/20px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/220px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/265px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/270px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/274px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/300px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/30px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/330px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/353px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/360px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/400px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/40px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/440px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/442px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/450px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/50px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/600px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/640px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/70px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/75px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/960px-Foobar.jpg", - - "$base/local-public/e/ea/Thumb.png", - - "$base/local-public/0/09/Bad.jpg", - - "$base/local-public/5/5f/LoremIpsum.djvu", - "$base/local-thumb/5/5f/LoremIpsum.djvu/page2-2480px-LoremIpsum.djvu.jpg", - "$base/local-thumb/5/5f/LoremIpsum.djvu/page2-3720px-LoremIpsum.djvu.jpg", - "$base/local-thumb/5/5f/LoremIpsum.djvu/page2-4960px-LoremIpsum.djvu.jpg", - - "$base/local-public/f/ff/Foobar.svg", - "$base/local-thumb/f/ff/Foobar.svg/180px-Foobar.svg.png", - "$base/local-thumb/f/ff/Foobar.svg/2000px-Foobar.svg.png", - "$base/local-thumb/f/ff/Foobar.svg/270px-Foobar.svg.png", - "$base/local-thumb/f/ff/Foobar.svg/3000px-Foobar.svg.png", - "$base/local-thumb/f/ff/Foobar.svg/360px-Foobar.svg.png", - "$base/local-thumb/f/ff/Foobar.svg/4000px-Foobar.svg.png", - "$base/local-thumb/f/ff/Foobar.svg/langde-180px-Foobar.svg.png", - "$base/local-thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.png", - "$base/local-thumb/f/ff/Foobar.svg/langde-360px-Foobar.svg.png", - - "$base/local-public/math/f/a/5/fa50b8b616463173474302ca3e63586b.png", - ] - ); - } - - /** - * Delete the specified files, if they exist. - * @param array $files Full paths to files to delete. - */ - private static function deleteFiles( $files ) { - $backend = RepoGroup::singleton()->getLocalRepo()->getBackend(); - foreach ( $files as $file ) { - $backend->delete( [ 'src' => $file ], [ 'force' => 1 ] ); - } - foreach ( $files as $file ) { - $tmp = FileBackend::parentStoragePath( $file ); - while ( $tmp ) { - if ( !$backend->clean( [ 'dir' => $tmp ] )->isOK() ) { - break; - } - $tmp = FileBackend::parentStoragePath( $tmp ); - } - } - } - - protected function getBaseDir() { - return 'mwstore://local-backend'; - } - - public function parserTestProvider() { - if ( $this->file === false ) { - global $wgParserTestFiles; - $this->file = $wgParserTestFiles[0]; - } - - return new TestFileDataProvider( $this->file, $this ); - } - - /** - * Set the file from whose tests will be run by this instance - * @param string $filename - */ - public function setParserTestFile( $filename ) { - $this->file = $filename; - } - - /** - * @group medium - * @group ParserTests - * @dataProvider parserTestProvider - * @param string $desc - * @param string $input - * @param string $result - * @param array $opts - * @param array $config - */ - public function testParserTest( $desc, $input, $result, $opts, $config ) { - if ( $this->regex != '' && !preg_match( '/' . $this->regex . '/', $desc ) ) { - $this->assertTrue( true ); // XXX: don't flood output with "test made no assertions" - // $this->markTestSkipped( 'Filtered out by the user' ); - return; - } - - if ( !$this->isWikitextNS( NS_MAIN ) ) { - // parser tests frequently assume that the main namespace contains wikitext. - // @todo When setting up pages, force the content model. Only skip if - // $wgtContentModelUseDB is false. - $this->markTestSkipped( "Main namespace does not support wikitext," - . "skipping parser test: $desc" ); - } - - wfDebug( "Running parser test: $desc\n" ); - - $opts = $this->parseOptions( $opts ); - $context = $this->setupGlobals( $opts, $config ); - - $user = $context->getUser(); - $options = ParserOptions::newFromContext( $context ); - - if ( isset( $opts['title'] ) ) { - $titleText = $opts['title']; - } else { - $titleText = 'Parser test'; - } - - $local = isset( $opts['local'] ); - $preprocessor = isset( $opts['preprocessor'] ) ? $opts['preprocessor'] : null; - $parser = $this->getParser( $preprocessor ); - - $title = Title::newFromText( $titleText ); - - # Parser test requiring math. Make sure texvc is executable - # or just skip such tests. - if ( isset( $opts['math'] ) || isset( $opts['texvc'] ) ) { - global $wgTexvc; - - if ( !isset( $wgTexvc ) ) { - $this->markTestSkipped( "SKIPPED: \$wgTexvc is not set" ); - } elseif ( !is_executable( $wgTexvc ) ) { - $this->markTestSkipped( "SKIPPED: texvc binary does not exist" - . " or is not executable.\n" - . "Current configuration is:\n\$wgTexvc = '$wgTexvc'" ); - } - } - - if ( isset( $opts['djvu'] ) ) { - if ( !$this->djVuSupport->isEnabled() ) { - $this->markTestSkipped( "SKIPPED: djvu binaries do not exist or are not executable.\n" ); - } - } - - if ( isset( $opts['tidy'] ) ) { - if ( !$this->tidySupport->isEnabled() ) { - $this->markTestSkipped( "SKIPPED: tidy extension is not installed.\n" ); - } else { - $options->setTidy( true ); - } - } - - if ( isset( $opts['pst'] ) ) { - $out = $parser->preSaveTransform( $input, $title, $user, $options ); - } elseif ( isset( $opts['msg'] ) ) { - $out = $parser->transformMsg( $input, $options, $title ); - } elseif ( isset( $opts['section'] ) ) { - $section = $opts['section']; - $out = $parser->getSection( $input, $section ); - } elseif ( isset( $opts['replace'] ) ) { - $section = $opts['replace'][0]; - $replace = $opts['replace'][1]; - $out = $parser->replaceSection( $input, $section, $replace ); - } elseif ( isset( $opts['comment'] ) ) { - $out = Linker::formatComment( $input, $title, $local ); - } elseif ( isset( $opts['preload'] ) ) { - $out = $parser->getPreloadText( $input, $title, $options ); - } else { - $output = $parser->parse( $input, $title, $options, true, true, 1337 ); - $output->setTOCEnabled( !isset( $opts['notoc'] ) ); - $out = $output->getText(); - if ( isset( $opts['tidy'] ) ) { - $out = preg_replace( '/\s+$/', '', $out ); - } - - if ( isset( $opts['showtitle'] ) ) { - if ( $output->getTitleText() ) { - $title = $output->getTitleText(); - } - - $out = "$title\n$out"; - } - - if ( isset( $opts['showindicators'] ) ) { - $indicators = ''; - foreach ( $output->getIndicators() as $id => $content ) { - $indicators .= "$id=$content\n"; - } - $out = $indicators . $out; - } - - if ( isset( $opts['ill'] ) ) { - $out = implode( ' ', $output->getLanguageLinks() ); - } elseif ( isset( $opts['cat'] ) ) { - $outputPage = $context->getOutput(); - $outputPage->addCategoryLinks( $output->getCategories() ); - $cats = $outputPage->getCategoryLinks(); - - if ( isset( $cats['normal'] ) ) { - $out = implode( ' ', $cats['normal'] ); - } else { - $out = ''; - } - } - $parser->mPreprocessor = null; - } - - $this->teardownGlobals(); - - $this->assertEquals( $result, $out, $desc ); - } - - /** - * Run a fuzz test series - * Draw input from a set of test files - * - * @todo fixme Needs some work to not eat memory until the world explodes - * - * @group ParserFuzz - */ - public function testFuzzTests() { - global $wgParserTestFiles; - - $files = $wgParserTestFiles; - - if ( $this->getCliArg( 'file' ) ) { - $files = [ $this->getCliArg( 'file' ) ]; - } - - $dict = $this->getFuzzInput( $files ); - $dictSize = strlen( $dict ); - $logMaxLength = log( $this->maxFuzzTestLength ); - - ini_set( 'memory_limit', $this->memoryLimit * 1048576 ); - - $user = new User; - $opts = ParserOptions::newFromUser( $user ); - $title = Title::makeTitle( NS_MAIN, 'Parser_test' ); - - $id = 1; - - while ( true ) { - - // Generate test input - mt_srand( ++$this->fuzzSeed ); - $totalLength = mt_rand( 1, $this->maxFuzzTestLength ); - $input = ''; - - while ( strlen( $input ) < $totalLength ) { - $logHairLength = mt_rand( 0, 1000000 ) / 1000000 * $logMaxLength; - $hairLength = min( intval( exp( $logHairLength ) ), $dictSize ); - $offset = mt_rand( 0, $dictSize - $hairLength ); - $input .= substr( $dict, $offset, $hairLength ); - } - - $this->setupGlobals(); - $parser = $this->getParser(); - - // Run the test - try { - $parser->parse( $input, $title, $opts ); - $this->assertTrue( true, "Test $id, fuzz seed {$this->fuzzSeed}" ); - } catch ( Exception $exception ) { - $input_dump = sprintf( "string(%d) \"%s\"\n", strlen( $input ), $input ); - - $this->assertTrue( false, "Test $id, fuzz seed {$this->fuzzSeed}. \n\n" . - "Input: $input_dump\n\nError: {$exception->getMessage()}\n\n" . - "Backtrace: {$exception->getTraceAsString()}" ); - } - - $this->teardownGlobals(); - $parser->__destruct(); - - if ( $id % 100 == 0 ) { - $usage = intval( memory_get_usage( true ) / $this->memoryLimit / 1048576 * 100 ); - // echo "{$this->fuzzSeed}: $numSuccess/$numTotal (mem: $usage%)\n"; - if ( $usage > 90 ) { - $ret = "Out of memory:\n"; - $memStats = $this->getMemoryBreakdown(); - - foreach ( $memStats as $name => $usage ) { - $ret .= "$name: $usage\n"; - } - - throw new MWException( $ret ); - } - } - - $id++; - } - } - - // Various getter functions - - /** - * Get an input dictionary from a set of parser test files - * @param array $filenames - * @return string - */ - function getFuzzInput( $filenames ) { - $dict = ''; - - foreach ( $filenames as $filename ) { - $contents = file_get_contents( $filename ); - preg_match_all( '/!!\s*input\n(.*?)\n!!\s*result/s', $contents, $matches ); - - foreach ( $matches[1] as $match ) { - $dict .= $match . "\n"; - } - } - - return $dict; - } - - /** - * Get a memory usage breakdown - * @return array - */ - function getMemoryBreakdown() { - $memStats = []; - - foreach ( $GLOBALS as $name => $value ) { - $memStats['$' . $name] = strlen( serialize( $value ) ); - } - - $classes = get_declared_classes(); - - foreach ( $classes as $class ) { - $rc = new ReflectionClass( $class ); - $props = $rc->getStaticProperties(); - $memStats[$class] = strlen( serialize( $props ) ); - $methods = $rc->getMethods(); - - foreach ( $methods as $method ) { - $memStats[$class] += strlen( serialize( $method->getStaticVariables() ) ); - } - } - - $functions = get_defined_functions(); - - foreach ( $functions['user'] as $function ) { - $rf = new ReflectionFunction( $function ); - $memStats["$function()"] = strlen( serialize( $rf->getStaticVariables() ) ); - } - - asort( $memStats ); - - return $memStats; - } - - /** - * Get a Parser object - * @param Preprocessor $preprocessor - * @return Parser - */ - function getParser( $preprocessor = null ) { - global $wgParserConf; - - $class = $wgParserConf['class']; - $parser = new $class( [ 'preprocessorClass' => $preprocessor ] + $wgParserConf ); - - Hooks::run( 'ParserTestParser', [ &$parser ] ); - - return $parser; - } - - // Various action functions - - public function addArticle( $name, $text, $line ) { - self::$articles[$name] = [ $text, $line ]; - } - - public function publishTestArticles() { - if ( empty( self::$articles ) ) { - return; - } - - foreach ( self::$articles as $name => $info ) { - list( $text, $line ) = $info; - ParserTest::addArticle( $name, $text, $line, 'ignoreduplicate' ); - } - } - - /** - * Steal a callback function from the primary parser, save it for - * application to our scary parser. If the hook is not installed, - * abort processing of this file. - * - * @param string $name - * @return bool True if tag hook is present - */ - public function requireHook( $name ) { - global $wgParser; - $wgParser->firstCallInit(); // make sure hooks are loaded. - return isset( $wgParser->mTagHooks[$name] ); - } - - public function requireFunctionHook( $name ) { - global $wgParser; - $wgParser->firstCallInit(); // make sure hooks are loaded. - return isset( $wgParser->mFunctionHooks[$name] ); - } - - public function requireTransparentHook( $name ) { - global $wgParser; - $wgParser->firstCallInit(); // make sure hooks are loaded. - return isset( $wgParser->mTransparentTagHooks[$name] ); - } - - // Various "cleanup" functions - - /** - * Remove last character if it is a newline - * @param string $s - * @return string - */ - public function removeEndingNewline( $s ) { - if ( substr( $s, -1 ) === "\n" ) { - return substr( $s, 0, -1 ); - } else { - return $s; - } - } - - // Test options parser functions - - protected function parseOptions( $instring ) { - $opts = []; - // foo - // foo=bar - // foo="bar baz" - // foo=[[bar baz]] - // foo=bar,"baz quux" - $regex = '/\b - ([\w-]+) # Key - \b - (?:\s* - = # First sub-value - \s* - ( - " - [^"]* # Quoted val - " - | - \[\[ - [^]]* # Link target - \]\] - | - [\w-]+ # Plain word - ) - (?:\s* - , # Sub-vals 1..N - \s* - ( - "[^"]*" # Quoted val - | - \[\[[^]]*\]\] # Link target - | - [\w-]+ # Plain word - ) - )* - )? - /x'; - - if ( preg_match_all( $regex, $instring, $matches, PREG_SET_ORDER ) ) { - foreach ( $matches as $bits ) { - array_shift( $bits ); - $key = strtolower( array_shift( $bits ) ); - if ( count( $bits ) == 0 ) { - $opts[$key] = true; - } elseif ( count( $bits ) == 1 ) { - $opts[$key] = $this->cleanupOption( array_shift( $bits ) ); - } else { - // Array! - $opts[$key] = array_map( [ $this, 'cleanupOption' ], $bits ); - } - } - } - - return $opts; - } - - protected function cleanupOption( $opt ) { - if ( substr( $opt, 0, 1 ) == '"' ) { - return substr( $opt, 1, -1 ); - } - - if ( substr( $opt, 0, 2 ) == '[[' ) { - return substr( $opt, 2, -2 ); - } - - return $opt; - } - - /** - * Use a regex to find out the value of an option - * @param string $key Name of option val to retrieve - * @param array $opts Options array to look in - * @param mixed $default Default value returned if not found - * @return mixed - */ - protected static function getOptionValue( $key, $opts, $default ) { - $key = strtolower( $key ); - - if ( isset( $opts[$key] ) ) { - return $opts[$key]; - } else { - return $default; - } - } -} diff --git a/tests/phpunit/includes/parser/ParserIntegrationTest.php b/tests/phpunit/includes/parser/ParserIntegrationTest.php new file mode 100644 index 0000000000..c92098248c --- /dev/null +++ b/tests/phpunit/includes/parser/ParserIntegrationTest.php @@ -0,0 +1,49 @@ +ptTest = $test; + $this->ptRunner = $runner; + } + + public function testParse() { + $this->ptRunner->getRecorder()->setTestCase( $this ); + $result = $this->ptRunner->runTest( $this->ptTest ); + $this->assertEquals( $result->expected, $result->actual ); + } + + public function setUp() { + $this->ptTeardownScope = $this->ptRunner->staticSetup(); + } + + public function tearDown() { + if ( $this->ptTeardownScope ) { + ScopedCallback::consume( $this->ptTeardownScope ); + } + } +} diff --git a/tests/phpunit/includes/parser/PreprocessorTest.php b/tests/phpunit/includes/parser/PreprocessorTest.php index c557a6e1f1..c491e6b829 100644 --- a/tests/phpunit/includes/parser/PreprocessorTest.php +++ b/tests/phpunit/includes/parser/PreprocessorTest.php @@ -1,5 +1,29 @@ assertEquals( $this->normalizeXml( $expectedXml ), @@ -187,10 +210,10 @@ class PreprocessorTest extends MediaWikiTestCase { public static function provideFiles() { // @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong return self::addClassArg( [ - [ "QuoteQuran" ], # http://en.wikipedia.org/w/index.php?title=Template:QuoteQuran/sandbox&oldid=237348988 GFDL + CC BY-SA by Striver - [ "Factorial" ], # http://en.wikipedia.org/w/index.php?title=Template:Factorial&oldid=98548758 GFDL + CC BY-SA by Polonium - [ "All_system_messages" ], # http://tl.wiktionary.org/w/index.php?title=Suleras:All_system_messages&oldid=2765 GPL text generated by MediaWiki - [ "Fundraising" ], # http://tl.wiktionary.org/w/index.php?title=MediaWiki:Sitenotice&oldid=5716 GFDL + CC BY-SA, copied there by Sky Harbor. + [ "QuoteQuran" ], # https://en.wikipedia.org/w/index.php?title=Template:QuoteQuran/sandbox&oldid=237348988 GFDL + CC BY-SA by Striver + [ "Factorial" ], # https://en.wikipedia.org/w/index.php?title=Template:Factorial&oldid=98548758 GFDL + CC BY-SA by Polonium + [ "All_system_messages" ], # https://tl.wiktionary.org/w/index.php?title=Suleras:All_system_messages&oldid=2765 GPL text generated by MediaWiki + [ "Fundraising" ], # https://tl.wiktionary.org/w/index.php?title=MediaWiki:Sitenotice&oldid=5716 GFDL + CC BY-SA, copied there by Sky Harbor. [ "NestedTemplates" ], # bug 27936 ] ); // @codingStandardsIgnoreEnd @@ -198,7 +221,6 @@ class PreprocessorTest extends MediaWikiTestCase { /** * @dataProvider provideFiles - * @covers Preprocessor_DOM::preprocessToXml */ public function testPreprocessorOutputFiles( $className, $filename ) { $folder = __DIR__ . "/../../../parser/preprocess"; @@ -264,7 +286,6 @@ class PreprocessorTest extends MediaWikiTestCase { /** * @dataProvider provideHeadings - * @covers Preprocessor_DOM::preprocessToXml */ public function testHeadings( $className, $wikiText, $expectedXml ) { $this->assertEquals( $this->normalizeXml( $expectedXml ), diff --git a/tests/phpunit/includes/registration/ExtensionRegistryTest.php b/tests/phpunit/includes/registration/ExtensionRegistryTest.php index 167f52a16f..1de42650fd 100644 --- a/tests/phpunit/includes/registration/ExtensionRegistryTest.php +++ b/tests/phpunit/includes/registration/ExtensionRegistryTest.php @@ -252,6 +252,41 @@ class ExtensionRegistryTest extends MediaWikiTestCase { 'mwtestT100767' => false, ], ], + [ + 'test array_replace_recursive', + [ + 'mwtestJsonConfigs' => [ + 'JsonZeroConfig' => [ + 'namespace' => 480, + 'nsName' => 'Zero', + 'isLocal' => false, + ], + ], + ], + [ + 'mwtestJsonConfigs' => [ + 'JsonZeroConfig' => [ + 'isLocal' => false, + 'remote' => [ + 'username' => 'foo', + ], + ], + ExtensionRegistry::MERGE_STRATEGY => 'array_replace_recursive', + ], + ], + [ + 'mwtestJsonConfigs' => [ + 'JsonZeroConfig' => [ + 'namespace' => 480, + 'nsName' => 'Zero', + 'isLocal' => false, + 'remote' => [ + 'username' => 'foo', + ], + ], + ], + ], + ], ]; } } diff --git a/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php b/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php index 90c9f385bb..0be04efdf3 100644 --- a/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php +++ b/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php @@ -2,11 +2,11 @@ /** * @group ResourceLoader + * @covers DerivativeResourceLoaderContext */ class DerivativeResourceLoaderContextTest extends PHPUnit_Framework_TestCase { - protected static function getResourceLoaderContext() { - $resourceLoader = new ResourceLoader(); + protected static function getContext() { $request = new FauxRequest( [ 'lang' => 'zh', 'modules' => 'test.context', @@ -14,42 +14,76 @@ class DerivativeResourceLoaderContextTest extends PHPUnit_Framework_TestCase { 'skin' => 'fallback', 'target' => 'test', ] ); - return new ResourceLoaderContext( $resourceLoader, $request ); + return new ResourceLoaderContext( new ResourceLoader(), $request ); } - public function testGet() { - $context = self::getResourceLoaderContext(); - $derived = new DerivativeResourceLoaderContext( $context ); + public function testGetInherited() { + $derived = new DerivativeResourceLoaderContext( self::getContext() ); + // Request parameters + $this->assertEquals( $derived->getDebug(), false ); $this->assertEquals( $derived->getLanguage(), 'zh' ); $this->assertEquals( $derived->getModules(), [ 'test.context' ] ); $this->assertEquals( $derived->getOnly(), 'scripts' ); $this->assertEquals( $derived->getSkin(), 'fallback' ); + $this->assertEquals( $derived->getUser(), null ); + + // Misc + $this->assertEquals( $derived->getDirection(), 'ltr' ); $this->assertEquals( $derived->getHash(), 'zh|fallback|||scripts|||||' ); } - public function testSetLanguage() { - $context = self::getResourceLoaderContext(); + public function testModules() { + $derived = new DerivativeResourceLoaderContext( self::getContext() ); + + $derived->setModules( [ 'test.override' ] ); + $this->assertEquals( $derived->getModules(), [ 'test.override' ] ); + } + + public function testLanguage() { + $context = self::getContext(); $derived = new DerivativeResourceLoaderContext( $context ); $derived->setLanguage( 'nl' ); $this->assertEquals( $derived->getLanguage(), 'nl' ); + } + + public function testDirection() { + $derived = new DerivativeResourceLoaderContext( self::getContext() ); + + $derived->setLanguage( 'nl' ); + $this->assertEquals( $derived->getDirection(), 'ltr' ); $derived->setLanguage( 'he' ); $this->assertEquals( $derived->getDirection(), 'rtl' ); + + $derived->setDirection( 'ltr' ); + $this->assertEquals( $derived->getDirection(), 'ltr' ); } - public function testSetModules() { - $context = self::getResourceLoaderContext(); - $derived = new DerivativeResourceLoaderContext( $context ); + public function testSkin() { + $derived = new DerivativeResourceLoaderContext( self::getContext() ); - $derived->setModules( [ 'test.override' ] ); - $this->assertEquals( $derived->getModules(), [ 'test.override' ] ); + $derived->setSkin( 'override' ); + $this->assertEquals( $derived->getSkin(), 'override' ); } - public function testSetOnly() { - $context = self::getResourceLoaderContext(); - $derived = new DerivativeResourceLoaderContext( $context ); + public function testUser() { + $derived = new DerivativeResourceLoaderContext( self::getContext() ); + + $derived->setUser( 'Example' ); + $this->assertEquals( $derived->getUser(), 'Example' ); + } + + public function testDebug() { + $derived = new DerivativeResourceLoaderContext( self::getContext() ); + + $derived->setDebug( true ); + $this->assertEquals( $derived->getDebug(), true ); + } + + public function testOnly() { + $derived = new DerivativeResourceLoaderContext( self::getContext() ); $derived->setOnly( 'styles' ); $this->assertEquals( $derived->getOnly(), 'styles' ); @@ -58,21 +92,35 @@ class DerivativeResourceLoaderContextTest extends PHPUnit_Framework_TestCase { $this->assertEquals( $derived->getOnly(), null ); } - public function testSetSkin() { - $context = self::getResourceLoaderContext(); - $derived = new DerivativeResourceLoaderContext( $context ); + public function testVersion() { + $derived = new DerivativeResourceLoaderContext( self::getContext() ); - $derived->setSkin( 'override' ); - $this->assertEquals( $derived->getSkin(), 'override' ); + $derived->setVersion( 'hw1' ); + $this->assertEquals( $derived->getVersion(), 'hw1' ); + } + + public function testRaw() { + $derived = new DerivativeResourceLoaderContext( self::getContext() ); + + $derived->setRaw( true ); + $this->assertEquals( $derived->getRaw(), true ); } public function testGetHash() { - $context = self::getResourceLoaderContext(); - $derived = new DerivativeResourceLoaderContext( $context ); + $derived = new DerivativeResourceLoaderContext( self::getContext() ); + + $this->assertEquals( $derived->getHash(), 'zh|fallback|||scripts|||||' ); $derived->setLanguage( 'nl' ); + $derived->setUser( 'Example' ); // Assert that subclass is able to clear parent class "hash" member - $this->assertEquals( $derived->getHash(), 'nl|fallback|||scripts|||||' ); + $this->assertEquals( $derived->getHash(), 'nl|fallback||Example|scripts|||||' ); } + public function testAccessors() { + $context = self::getContext(); + $derived = new DerivativeResourceLoaderContext( $context ); + $this->assertSame( $derived->getRequest(), $context->getRequest() ); + $this->assertSame( $derived->getResourceLoader(), $context->getResourceLoader() ); + } } diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php index 0965b9f914..528c3220e8 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php @@ -5,6 +5,12 @@ */ class ResourceLoaderClientHtmlTest extends PHPUnit_Framework_TestCase { + protected static function expandVariables( $text ) { + return strtr( $text, [ + '{blankVer}' => ResourceLoaderTestCase::BLANK_VERSION + ] ); + } + protected static function makeContext( $extraQuery = [] ) { $conf = new HashConfig( [ 'ResourceLoaderSources' => [], @@ -108,22 +114,22 @@ class ResourceLoaderClientHtmlTest extends PHPUnit_Framework_TestCase { 'test.scripts.mixed.user.empty' => 'ready', ], 'general' => [ - 'top' => [ 'test.top' ], - 'bottom' => [ 'test' ], + 'test', + 'test.top', ], 'styles' => [ 'test.styles.mixed', 'test.styles.pure', ], 'scripts' => [ - 'top' => [ 'test.scripts.top' ], - 'bottom' => [ 'test.scripts' ], + 'test.scripts', + 'test.scripts.top', ], 'embed' => [ 'styles' => [ 'test.styles.private' ], 'general' => [ - 'top' => [ 'test.private.top' ], - 'bottom' => [ 'test.private.bottom' ], + 'test.private.bottom', + 'test.private.top', ], ], ]; @@ -165,7 +171,7 @@ class ResourceLoaderClientHtmlTest extends PHPUnit_Framework_TestCase { . '' . "\n" @@ -173,6 +179,7 @@ class ResourceLoaderClientHtmlTest extends PHPUnit_Framework_TestCase { . '' . "\n" . ''; // @codingStandardsIgnoreEnd + $expected = self::expandVariables( $expected ); $this->assertEquals( $expected, $client->getHeadHtml() ); } @@ -195,13 +202,8 @@ class ResourceLoaderClientHtmlTest extends PHPUnit_Framework_TestCase { 'test.scripts', ] ); - // @codingStandardsIgnoreStart Generic.Files.LineLength - $expected = ''; - // @codingStandardsIgnoreEnd + $expected = ''; + $expected = self::expandVariables( $expected ); $this->assertEquals( $expected, $client->getBodyHtml() ); } @@ -225,7 +227,7 @@ class ResourceLoaderClientHtmlTest extends PHPUnit_Framework_TestCase { 'context' => [], 'modules' => [ 'test.private.top' ], 'only' => ResourceLoaderModule::TYPE_COMBINED, - 'output' => '', + 'output' => '', ], [ 'context' => [], @@ -273,6 +275,7 @@ class ResourceLoaderClientHtmlTest extends PHPUnit_Framework_TestCase { $context = self::makeContext( $extraQuery ); $context->getResourceLoader()->register( self::makeSampleModules() ); $actual = ResourceLoaderClientHtml::makeLoad( $context, $modules, $type ); + $expected = self::expandVariables( $expected ); $this->assertEquals( $expected, (string)$actual ); } } diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php new file mode 100644 index 0000000000..1093039f88 --- /dev/null +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php @@ -0,0 +1,107 @@ + false, + 'DefaultSkin' => 'fallback', + 'LanguageCode' => 'nl', + ] ) ); + } + + public function testEmpty() { + $ctx = new ResourceLoaderContext( $this->getResourceLoader(), new FauxRequest( [] ) ); + + // Request parameters + $this->assertEquals( [], $ctx->getModules() ); + $this->assertEquals( 'nl', $ctx->getLanguage() ); + $this->assertEquals( false, $ctx->getDebug() ); + $this->assertEquals( null, $ctx->getOnly() ); + $this->assertEquals( 'fallback', $ctx->getSkin() ); + $this->assertEquals( null, $ctx->getUser() ); + + // Misc + $this->assertEquals( 'ltr', $ctx->getDirection() ); + $this->assertEquals( 'nl|fallback||||||||', $ctx->getHash() ); + $this->assertInstanceOf( User::class, $ctx->getUserObj() ); + } + + public function testDummy() { + $this->assertInstanceOf( + ResourceLoaderContext::class, + ResourceLoaderContext::newDummyContext() + ); + } + + public function testAccessors() { + $ctx = new ResourceLoaderContext( $this->getResourceLoader(), new FauxRequest( [] ) ); + $this->assertInstanceOf( WebRequest::class, $ctx->getRequest() ); + $this->assertInstanceOf( \Psr\Log\LoggerInterface::class, $ctx->getLogger() ); + } + + public function testTypicalRequest() { + $ctx = new ResourceLoaderContext( $this->getResourceLoader(), new FauxRequest( [ + 'debug' => 'false', + 'lang' => 'zh', + 'modules' => 'foo|foo.quux,baz,bar|baz.quux', + 'only' => 'styles', + 'skin' => 'fallback', + ] ) ); + + // Request parameters + $this->assertEquals( + $ctx->getModules(), + [ 'foo', 'foo.quux', 'foo.baz', 'foo.bar', 'baz.quux' ] + ); + $this->assertEquals( false, $ctx->getDebug() ); + $this->assertEquals( 'zh', $ctx->getLanguage() ); + $this->assertEquals( 'styles', $ctx->getOnly() ); + $this->assertEquals( 'fallback', $ctx->getSkin() ); + $this->assertEquals( null, $ctx->getUser() ); + + // Misc + $this->assertEquals( 'ltr', $ctx->getDirection() ); + $this->assertEquals( 'zh|fallback|||styles|||||', $ctx->getHash() ); + } + + public function testShouldInclude() { + $ctx = new ResourceLoaderContext( $this->getResourceLoader(), new FauxRequest( [] ) ); + $this->assertTrue( $ctx->shouldIncludeScripts(), 'Scripts in combined' ); + $this->assertTrue( $ctx->shouldIncludeStyles(), 'Styles in combined' ); + $this->assertTrue( $ctx->shouldIncludeMessages(), 'Messages in combined' ); + + $ctx = new ResourceLoaderContext( $this->getResourceLoader(), new FauxRequest( [ + 'only' => 'styles' + ] ) ); + $this->assertFalse( $ctx->shouldIncludeScripts(), 'Scripts not in styles-only' ); + $this->assertTrue( $ctx->shouldIncludeStyles(), 'Styles in styles-only' ); + $this->assertFalse( $ctx->shouldIncludeMessages(), 'Messages not in styles-only' ); + + $ctx = new ResourceLoaderContext( $this->getResourceLoader(), new FauxRequest( [ + 'only' => 'scripts' + ] ) ); + $this->assertTrue( $ctx->shouldIncludeScripts(), 'Scripts in scripts-only' ); + $this->assertFalse( $ctx->shouldIncludeStyles(), 'Styles not in scripts-only' ); + $this->assertFalse( $ctx->shouldIncludeMessages(), 'Messages not in scripts-only' ); + } + + public function testGetUser() { + $ctx = new ResourceLoaderContext( $this->getResourceLoader(), new FauxRequest( [] ) ); + $this->assertSame( null, $ctx->getUser() ); + $this->assertTrue( $ctx->getUserObj()->isAnon() ); + + $ctx = new ResourceLoaderContext( $this->getResourceLoader(), new FauxRequest( [ + 'user' => 'Example' + ] ) ); + $this->assertSame( 'Example', $ctx->getUser() ); + $this->assertEquals( 'Example', $ctx->getUserObj()->getName() ); + } +} diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php index 2114e0acec..8b29983e70 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php @@ -102,6 +102,7 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase { */ public function testTemplateDependencies( $module, $expected ) { $rl = new ResourceLoaderFileModule( $module ); + $rl->setName( 'testing' ); $this->assertEquals( $rl->getDependencies(), $expected ); } @@ -164,6 +165,7 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase { ]; $module = new ResourceLoaderFileModule( $baseParams ); + $module->setName( 'testing' ); $this->assertEquals( [ @@ -201,10 +203,12 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase { 'localBasePath' => $basePath, 'styles' => [ 'test.css' ], ] ); + $testModule->setName( 'testing' ); $expectedModule = new ResourceLoaderFileModule( [ 'localBasePath' => $basePath, 'styles' => [ 'expected.css' ], ] ); + $expectedModule->setName( 'testing' ); $contextLtr = $this->getResourceLoaderContext( 'en', 'ltr' ); $contextRtl = $this->getResourceLoaderContext( 'he', 'rtl' ); @@ -260,6 +264,7 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase { */ public function testGetTemplates( $module, $expected ) { $rl = new ResourceLoaderFileModule( $module ); + $rl->setName( 'testing' ); $this->assertEquals( $rl->getTemplates(), $expected ); } @@ -270,6 +275,7 @@ class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase { 'localBasePath' => $basePath, 'styles' => [ 'bom.css' ], ] ); + $testModule->setName( 'testing' ); $this->assertEquals( substr( file_get_contents( "$basePath/bom.css" ), 0, 10 ), "\xef\xbb\xbf.efbbbf", diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php index f61540d8ab..aeb82d14ff 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php @@ -154,6 +154,49 @@ class ResourceLoaderImageModuleTest extends ResourceLoaderTestCase { $styles = $module->getStyles( $this->getResourceLoaderContext() ); $this->assertEquals( $expected, $styles['all'] ); } + + /** + * @covers ResourceLoaderContext::getImageObj + */ + public function testContext() { + $context = new ResourceLoaderContext( new EmptyResourceLoader(), new FauxRequest() ); + $this->assertFalse( $context->getImageObj(), 'Missing image parameter' ); + + $context = new ResourceLoaderContext( new EmptyResourceLoader(), new FauxRequest( [ + 'image' => 'example', + ] ) ); + $this->assertFalse( $context->getImageObj(), 'Missing module parameter' ); + + $context = new ResourceLoaderContext( new EmptyResourceLoader(), new FauxRequest( [ + 'modules' => 'unknown', + 'image' => 'example', + ] ) ); + $this->assertFalse( $context->getImageObj(), 'Not an image module' ); + + $rl = new EmptyResourceLoader(); + $rl->register( 'test', [ + 'class' => ResourceLoaderImageModule::class, + 'prefix' => 'test', + 'images' => [ 'example' => 'example.png' ], + ] ); + $context = new ResourceLoaderContext( $rl, new FauxRequest( [ + 'modules' => 'test', + 'image' => 'unknown', + ] ) ); + $this->assertFalse( $context->getImageObj(), 'Unknown image' ); + + $rl = new EmptyResourceLoader(); + $rl->register( 'test', [ + 'class' => ResourceLoaderImageModule::class, + 'prefix' => 'test', + 'images' => [ 'example' => 'example.png' ], + ] ); + $context = new ResourceLoaderContext( $rl, new FauxRequest( [ + 'modules' => 'test', + 'image' => 'example', + ] ) ); + $this->assertInstanceOf( ResourceLoaderImage::class, $context->getImageObj() ); + } } class ResourceLoaderImageModuleTestable extends ResourceLoaderImageModule { diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php index ab1323ecdc..1b756be629 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php @@ -2,14 +2,9 @@ class ResourceLoaderStartUpModuleTest extends ResourceLoaderTestCase { - // Version hash for a blank file module. - // Result of ResourceLoader::makeHash(), ResourceLoaderTestModule - // and ResourceLoaderFileModule::getDefinitionSummary(). - protected static $blankVersion = '09p30q0'; - protected static function expandPlaceholders( $text ) { return strtr( $text, [ - '{blankVer}' => self::$blankVersion + '{blankVer}' => self::BLANK_VERSION ] ); } diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php index 53c99265f8..1ecdf21d92 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php @@ -51,6 +51,16 @@ class ResourceLoaderTest extends ResourceLoaderTestCase { $this->assertEquals( $module, $resourceLoader->getModule( 'test' ) ); } + /** + * @covers ResourceLoader::register + */ + public function testRegisterEmptyString() { + $module = new ResourceLoaderTestModule(); + $resourceLoader = new EmptyResourceLoader(); + $resourceLoader->register( '', $module ); + $this->assertEquals( $module, $resourceLoader->getModule( '' ) ); + } + /** * @covers ResourceLoader::register */ @@ -163,6 +173,12 @@ class ResourceLoaderTest extends ResourceLoaderTestCase { [ 'single.module', 'foobar', 'foobaz' ], 'single.module|foobar,foobaz', ], + [ + 'Ordering', + [ 'foo', 'foo.baz', 'baz.quux', 'foo.bar' ], + 'foo|foo.baz,bar|baz.quux', + [ 'foo', 'foo.baz', 'foo.bar', 'baz.quux' ], + ] ]; } @@ -178,8 +194,12 @@ class ResourceLoaderTest extends ResourceLoaderTestCase { * @dataProvider providePackedModules * @covers ResourceLoaderContext::expandModuleNames */ - public function testexpandModuleNames( $desc, $modules, $packed ) { - $this->assertEquals( $modules, ResourceLoaderContext::expandModuleNames( $packed ), $desc ); + public function testExpandModuleNames( $desc, $modules, $packed, $unpacked = null ) { + $this->assertEquals( + $unpacked ?: $modules, + ResourceLoaderContext::expandModuleNames( $packed ), + $desc + ); } public static function provideAddSource() { @@ -271,7 +291,6 @@ mw.example(); 'name' => 'test.example', 'scripts' => [], 'styles' => [ 'css' => [ '.mw-example {}' ] ], - 'messages' => new XmlJsCode( '{}' ), 'expected' => 'mw.loader.implement( "test.example", [], { "css": [ @@ -310,18 +329,10 @@ mw.example(); 'name' => 'user', 'scripts' => 'mw.example( 1 );', + 'wrap' => false, 'expected' => 'mw.loader.implement( "user", "mw.example( 1 );" );', ] ], - [ [ - 'title' => 'Implement unwrapped user script', - 'debug' => false, - - 'name' => 'user', - 'scripts' => 'mw.example( 1 );', - - 'expected' => 'mw.loader.implement("user","mw.example(1);");', - ] ], ]; } @@ -332,17 +343,20 @@ mw.example(); */ public function testMakeLoaderImplementScript( $case ) { $case += [ - 'styles' => [], 'templates' => [], 'messages' => new XmlJsCode( '{}' ), - 'debug' => true + 'wrap' => true, + 'styles' => [], 'templates' => [], 'messages' => new XmlJsCode( '{}' ) ]; ResourceLoader::clearCache(); - $this->setMwGlobals( 'wgResourceLoaderDebug', $case['debug'] ); + $this->setMwGlobals( 'wgResourceLoaderDebug', true ); + $rl = TestingAccessWrapper::newFromClass( 'ResourceLoader' ); $this->assertEquals( $case['expected'], - ResourceLoader::makeLoaderImplementScript( + $rl->makeLoaderImplementScript( $case['name'], - $case['scripts'], + ( $case['wrap'] && is_string( $case['scripts'] ) ) + ? new XmlJsCode( $case['scripts'] ) + : $case['scripts'], $case['styles'], $case['messages'], $case['templates'] @@ -355,7 +369,8 @@ mw.example(); */ public function testMakeLoaderImplementScriptInvalid() { $this->setExpectedException( 'MWException', 'Invalid scripts error' ); - ResourceLoader::makeLoaderImplementScript( + $rl = TestingAccessWrapper::newFromClass( 'ResourceLoader' ); + $rl->makeLoaderImplementScript( 'test', // name 123, // scripts null, // styles diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php index 85834d71e7..a332528ffb 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php @@ -114,28 +114,113 @@ class ResourceLoaderWikiModuleTest extends ResourceLoaderTestCase { [ [], 'test1', true ], // 'site' module with a non-empty page [ - [ 'MediaWiki:Common.js' => [ 'rev_sha1' => 'dmh6qn', 'rev_len' => 1234 ] ], + [ 'MediaWiki:Common.js' => [ 'page_len' => 1234 ] ], 'site', false, ], // 'site' module with an empty page [ - [ 'MediaWiki:Foo.js' => [ 'rev_sha1' => 'phoi', 'rev_len' => 0 ] ], + [ 'MediaWiki:Foo.js' => [ 'page_len' => 0 ] ], 'site', false, ], // 'user' module with a non-empty page [ - [ 'User:Example/common.js' => [ 'rev_sha1' => 'j7ssba', 'rev_len' => 25 ] ], + [ 'User:Example/common.js' => [ 'page_len' => 25 ] ], 'user', false, ], // 'user' module with an empty page [ - [ 'User:Example/foo.js' => [ 'rev_sha1' => 'phoi', 'rev_len' => 0 ] ], + [ 'User:Example/foo.js' => [ 'page_len' => 0 ] ], 'user', true, ], ]; } + + /** + * @covers ResourceLoaderWikiModule::getTitleInfo + */ + public function testGetTitleInfo() { + $pages = [ + 'MediaWiki:Common.css' => [ 'type' => 'styles' ], + 'mediawiki: fallback.css' => [ 'type' => 'styles' ], + ]; + $titleInfo = [ + 'MediaWiki:Common.css' => [ 'page_len' => 1234 ], + 'MediaWiki:Fallback.css' => [ 'page_len' => 0 ], + ]; + $expected = $titleInfo; + + $module = $this->getMockBuilder( 'TestResourceLoaderWikiModule' ) + ->setMethods( [ 'getPages' ] ) + ->getMock(); + $module->method( 'getPages' )->willReturn( $pages ); + // Can't mock static methods + $module::$returnFetchTitleInfo = $titleInfo; + + $context = $this->getMockBuilder( 'ResourceLoaderContext' ) + ->disableOriginalConstructor() + ->getMock(); + + $module = TestingAccessWrapper::newFromObject( $module ); + $this->assertEquals( $expected, $module->getTitleInfo( $context ), 'Title info' ); + } + + /** + * @covers ResourceLoaderWikiModule::getTitleInfo + * @covers ResourceLoaderWikiModule::setTitleInfo + * @covers ResourceLoaderWikiModule::preloadTitleInfo + */ + public function testGetPreloadedTitleInfo() { + $pages = [ + 'MediaWiki:Common.css' => [ 'type' => 'styles' ], + // Regression against T145673. It's impossible to statically declare page names in + // a canonical way since the canonical prefix is localised. As such, the preload + // cache computed the right cache key, but failed to find the results when + // doing an intersect on the canonical result, producing an empty array. + 'mediawiki: fallback.css' => [ 'type' => 'styles' ], + ]; + $titleInfo = [ + 'MediaWiki:Common.css' => [ 'page_len' => 1234 ], + 'MediaWiki:Fallback.css' => [ 'page_len' => 0 ], + ]; + $expected = $titleInfo; + + $module = $this->getMockBuilder( 'TestResourceLoaderWikiModule' ) + ->setMethods( [ 'getPages' ] ) + ->getMock(); + $module->method( 'getPages' )->willReturn( $pages ); + // Can't mock static methods + $module::$returnFetchTitleInfo = $titleInfo; + + $rl = new EmptyResourceLoader(); + $rl->register( 'testmodule', $module ); + $context = new ResourceLoaderContext( $rl, new FauxRequest() ); + + TestResourceLoaderWikiModule::invalidateModuleCache( + Title::newFromText( 'MediaWiki:Common.css' ), + null, + null, + wfWikiID() + ); + TestResourceLoaderWikiModule::preloadTitleInfo( + $context, + wfGetDB( DB_REPLICA ), + [ 'testmodule' ] + ); + + $module = TestingAccessWrapper::newFromObject( $module ); + $this->assertEquals( $expected, $module->getTitleInfo( $context ), 'Title info' ); + } +} + +class TestResourceLoaderWikiModule extends ResourceLoaderWikiModule { + public static $returnFetchTitleInfo = null; + protected static function fetchTitleInfo( IDatabase $db, array $pages, $fname = null ) { + $ret = self::$returnFetchTitleInfo; + self::$returnFetchTitleInfo = null; + return $ret; + } } diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php index 0b34b6f9b5..3fb4bbbb1f 100644 --- a/tests/phpunit/includes/search/SearchEngineTest.php +++ b/tests/phpunit/includes/search/SearchEngineTest.php @@ -30,7 +30,7 @@ class SearchEngineTest extends MediaWikiLangTestCase { $this->markTestSkipped( "MySQL or SQLite with FTS3 only" ); } - $searchType = $this->db->getSearchEngine(); + $searchType = SearchEngineFactory::getSearchEngineClass( $this->db ); $this->setMwGlobals( [ 'wgSearchType' => $searchType ] ); @@ -207,4 +207,50 @@ class SearchEngineTest extends MediaWikiLangTestCase { $this->assertArrayHasKey( 'testData', $mapping ); $this->assertEquals( 'test', $mapping['testData'] ); } + + public function hookSearchIndexFields( $mockFieldBuilder, &$fields, SearchEngine $engine ) { + $fields['testField'] = $mockFieldBuilder( "testField", SearchIndexField::INDEX_TYPE_TEXT ); + return true; + } + + public function testAugmentorSearch() { + $this->search->setNamespaces( [ 0, 1, 4 ] ); + $resultSet = $this->search->searchText( 'smithee' ); + // Not using mock since PHPUnit mocks do not work properly with references in params + $this->mergeMwGlobalArrayValue( 'wgHooks', + [ 'SearchResultsAugment' => [ [ $this, 'addAugmentors' ] ] ] ); + $this->search->augmentSearchResults( $resultSet ); + for ( $result = $resultSet->next(); $result; $result = $resultSet->next() ) { + $id = $result->getTitle()->getArticleID(); + $augmentData = "Result:$id:" . $result->getTitle()->getText(); + $augmentData2 = "Result2:$id:" . $result->getTitle()->getText(); + $this->assertEquals( [ 'testSet' => $augmentData, 'testRow' => $augmentData2 ], + $result->getExtensionData() ); + } + } + + public function addAugmentors( &$setAugmentors, &$rowAugmentors ) { + $setAugmentor = $this->getMock( 'ResultSetAugmentor' ); + $setAugmentor->expects( $this->once() ) + ->method( 'augmentAll' ) + ->willReturnCallback( function ( SearchResultSet $resultSet ) { + $data = []; + for ( $result = $resultSet->next(); $result; $result = $resultSet->next() ) { + $id = $result->getTitle()->getArticleID(); + $data[$id] = "Result:$id:" . $result->getTitle()->getText(); + } + $resultSet->rewind(); + return $data; + } ); + $setAugmentors['testSet'] = $setAugmentor; + + $rowAugmentor = $this->getMock( 'ResultAugmentor' ); + $rowAugmentor->expects( $this->exactly( 2 ) ) + ->method( 'augment' ) + ->willReturnCallback( function ( SearchResult $result ) { + $id = $result->getTitle()->getArticleID(); + return "Result2:$id:" . $result->getTitle()->getText(); + } ); + $rowAugmentors['testRow'] = $rowAugmentor; + } } diff --git a/tests/phpunit/includes/session/PHPSessionHandlerTest.php b/tests/phpunit/includes/session/PHPSessionHandlerTest.php index 799a97bbb1..34e5e449a3 100644 --- a/tests/phpunit/includes/session/PHPSessionHandlerTest.php +++ b/tests/phpunit/includes/session/PHPSessionHandlerTest.php @@ -21,7 +21,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { } return false; } ); - $reset[] = new \ScopedCallback( 'restore_error_handler' ); + $reset[] = new \Wikimedia\ScopedCallback( 'restore_error_handler' ); $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); @@ -30,7 +30,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { $oldManager = $old->manager; $oldStore = $old->store; $oldLogger = $old->logger; - $reset[] = new \ScopedCallback( + $reset[] = new \Wikimedia\ScopedCallback( [ PHPSessionHandler::class, 'install' ], [ $oldManager, $oldStore, $oldLogger ] ); @@ -49,7 +49,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); - $reset = new \ScopedCallback( [ $rProp, 'setValue' ], [ $rProp->getValue() ] ); + $reset = new \Wikimedia\ScopedCallback( [ $rProp, 'setValue' ], [ $rProp->getValue() ] ); $rProp->setValue( $handler ); $handler->setEnableFlags( 'enable' ); @@ -123,7 +123,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { ] ); PHPSessionHandler::install( $manager ); $wrap = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); - $reset[] = new \ScopedCallback( + $reset[] = new \Wikimedia\ScopedCallback( [ $wrap, 'setEnableFlags' ], [ $wrap->enable ? $wrap->warn ? 'warn' : 'enable' : 'disable' ] ); @@ -326,7 +326,7 @@ class PHPSessionHandlerTest extends MediaWikiTestCase { \TestingAccessWrapper::newFromObject( $handler )->setEnableFlags( 'disable' ); $oldValue = $rProp->getValue(); $rProp->setValue( $handler ); - $reset = new \ScopedCallback( [ $rProp, 'setValue' ], [ $oldValue ] ); + $reset = new \Wikimedia\ScopedCallback( [ $rProp, 'setValue' ], [ $oldValue ] ); call_user_func_array( [ $handler, $method ], $args ); } diff --git a/tests/phpunit/includes/session/SessionBackendTest.php b/tests/phpunit/includes/session/SessionBackendTest.php index a3d5de772c..8a0adbad76 100644 --- a/tests/phpunit/includes/session/SessionBackendTest.php +++ b/tests/phpunit/includes/session/SessionBackendTest.php @@ -464,7 +464,7 @@ class SessionBackendTest extends MediaWikiTestCase { // Save happens when delay is consumed $this->onSessionMetadataCalled = false; $priv->metaDirty = true; - \ScopedCallback::consume( $delay ); + \Wikimedia\ScopedCallback::consume( $delay ); $this->assertTrue( $this->onSessionMetadataCalled ); // Test multiple delays @@ -475,11 +475,11 @@ class SessionBackendTest extends MediaWikiTestCase { $priv->metaDirty = true; $priv->autosave(); $this->assertFalse( $this->onSessionMetadataCalled ); - \ScopedCallback::consume( $delay3 ); + \Wikimedia\ScopedCallback::consume( $delay3 ); $this->assertFalse( $this->onSessionMetadataCalled ); - \ScopedCallback::consume( $delay1 ); + \Wikimedia\ScopedCallback::consume( $delay1 ); $this->assertFalse( $this->onSessionMetadataCalled ); - \ScopedCallback::consume( $delay2 ); + \Wikimedia\ScopedCallback::consume( $delay2 ); $this->assertTrue( $this->onSessionMetadataCalled ); } @@ -822,7 +822,7 @@ class SessionBackendTest extends MediaWikiTestCase { $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); - $resetHandler = new \ScopedCallback( function () use ( $handler ) { + $resetHandler = new \Wikimedia\ScopedCallback( function () use ( $handler ) { session_write_close(); $handler->enable = false; } ); @@ -862,7 +862,7 @@ class SessionBackendTest extends MediaWikiTestCase { $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); - $resetHandler = new \ScopedCallback( function () use ( $handler ) { + $resetHandler = new \Wikimedia\ScopedCallback( function () use ( $handler ) { session_write_close(); $handler->enable = false; } ); @@ -898,7 +898,7 @@ class SessionBackendTest extends MediaWikiTestCase { $rProp = new \ReflectionProperty( PHPSessionHandler::class, 'instance' ); $rProp->setAccessible( true ); $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); - $resetHandler = new \ScopedCallback( function () use ( $handler ) { + $resetHandler = new \Wikimedia\ScopedCallback( function () use ( $handler ) { session_write_close(); $handler->enable = false; } ); diff --git a/tests/phpunit/includes/session/SessionManagerTest.php b/tests/phpunit/includes/session/SessionManagerTest.php index 1ebb07c8e6..6273f477c8 100644 --- a/tests/phpunit/includes/session/SessionManagerTest.php +++ b/tests/phpunit/includes/session/SessionManagerTest.php @@ -62,7 +62,7 @@ class SessionManagerTest extends MediaWikiTestCase { $rProp->setAccessible( true ); $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() ); $oldEnable = $handler->enable; - $reset[] = new \ScopedCallback( function () use ( $handler, $oldEnable ) { + $reset[] = new \Wikimedia\ScopedCallback( function () use ( $handler, $oldEnable ) { if ( $handler->enable ) { session_write_close(); } diff --git a/tests/phpunit/includes/session/SessionProviderTest.php b/tests/phpunit/includes/session/SessionProviderTest.php index 4cbeeb954c..8284d05e97 100644 --- a/tests/phpunit/includes/session/SessionProviderTest.php +++ b/tests/phpunit/includes/session/SessionProviderTest.php @@ -138,7 +138,6 @@ class SessionProviderTest extends MediaWikiTestCase { $ex->getMessage() ); } - } public function testHashToSessionId() { diff --git a/tests/phpunit/includes/session/SessionTest.php b/tests/phpunit/includes/session/SessionTest.php index 3815416c31..e6a6ad351f 100644 --- a/tests/phpunit/includes/session/SessionTest.php +++ b/tests/phpunit/includes/session/SessionTest.php @@ -299,7 +299,6 @@ class SessionTest extends MediaWikiTestCase { $session->resetAllTokens(); $this->assertArrayNotHasKey( 'wsTokenSecrets', $backend->data ); - } /** diff --git a/tests/phpunit/includes/session/TestUtils.php b/tests/phpunit/includes/session/TestUtils.php index f1dc9e994b..f00de55a30 100644 --- a/tests/phpunit/includes/session/TestUtils.php +++ b/tests/phpunit/includes/session/TestUtils.php @@ -12,7 +12,7 @@ class TestUtils { /** * Override the singleton for unit testing * @param SessionManager|null $manager - * @return \\ScopedCallback|null + * @return \\Wikimedia\ScopedCallback|null */ public static function setSessionManagerSingleton( SessionManager $manager = null ) { session_write_close(); @@ -45,7 +45,7 @@ class TestUtils { PHPSessionHandler::install( $manager ); } - return new \ScopedCallback( function () use ( &$reset, $oldInstance ) { + return new \Wikimedia\ScopedCallback( function () use ( &$reset, $oldInstance ) { foreach ( $reset as &$arr ) { $arr[0]->setValue( $arr[1] ); } diff --git a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php index 3d407fbc32..f79f6e48c5 100644 --- a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php +++ b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php @@ -1,4 +1,6 @@ [ 'SpecialAllPages' ], + 'class name' => [ 'SpecialAllPages', false ], 'closure' => [ function () { return new SpecialAllPages(); - } ], - 'function' => [ [ $this, 'newSpecialAllPages' ] ], - 'callback string' => [ 'SpecialPageTestHelper::newSpecialAllPages' ], + }, false ], + 'function' => [ [ $this, 'newSpecialAllPages' ], false ], + 'callback string' => [ 'SpecialPageTestHelper::newSpecialAllPages', false ], 'callback with object' => [ - [ $specialPageTestHelper, 'newSpecialAllPages' ] + [ $specialPageTestHelper, 'newSpecialAllPages' ], + false ], 'callback array' => [ - [ 'SpecialPageTestHelper', 'newSpecialAllPages' ] + [ 'SpecialPageTestHelper', 'newSpecialAllPages' ], + false ] ]; } @@ -74,7 +78,7 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { * @covers SpecialPageFactory::getPage * @dataProvider specialPageProvider */ - public function testGetPage( $spec ) { + public function testGetPage( $spec, $shouldReuseInstance ) { $this->mergeMwGlobalArrayValue( 'wgSpecialPages', [ 'testdummy' => $spec ] ); SpecialPageFactory::resetList(); @@ -82,7 +86,7 @@ class SpecialPageFactoryTest extends MediaWikiTestCase { $this->assertInstanceOf( 'SpecialPage', $page ); $page2 = SpecialPageFactory::getPage( 'testdummy' ); - $this->assertEquals( true, $page2 === $page, "Should re-use instance:" ); + $this->assertEquals( $shouldReuseInstance, $page2 === $page, "Should re-use instance:" ); } /** diff --git a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php index 061e59823a..c1083afdbc 100644 --- a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php +++ b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php @@ -22,7 +22,7 @@ class QueryAllSpecialPagesTest extends MediaWikiTestCase { * Pages whose query use the same DB table more than once. * This is used to skip testing those pages when run against a MySQL backend * which does not support reopening a temporary table. See upstream bug: - * http://bugs.mysql.com/bug.php?id=10327 + * https://bugs.mysql.com/bug.php?id=10327 */ protected $reopensTempTable = [ 'BrokenRedirects', @@ -51,7 +51,7 @@ class QueryAllSpecialPagesTest extends MediaWikiTestCase { foreach ( $this->queryPages as $page ) { // With MySQL, skips special pages reopening a temporary table - // See http://bugs.mysql.com/bug.php?id=10327 + // See https://bugs.mysql.com/bug.php?id=10327 if ( $wgDBtype === 'mysql' && in_array( $page->getName(), $this->reopensTempTable ) diff --git a/tests/phpunit/includes/specials/SpecialBooksourcesTest.php b/tests/phpunit/includes/specials/SpecialBooksourcesTest.php index 3310d0217a..074045d79f 100644 --- a/tests/phpunit/includes/specials/SpecialBooksourcesTest.php +++ b/tests/phpunit/includes/specials/SpecialBooksourcesTest.php @@ -1,5 +1,5 @@ assertSame( $isValid, SpecialBookSources::isValidISBN( $isbn ) ); } + + protected function newSpecialPage() { + return new SpecialBookSources(); + } + + /** + * @covers SpecialBookSources::execute + */ + public function testExecute() { + list( $html, ) = $this->executeSpecialPage( 'Invalid', null, 'qqx' ); + $this->assertContains( '(booksources-invalid-isbn)', $html ); + list( $html, ) = $this->executeSpecialPage( '0-7475-3269-9', null, 'qqx' ); + $this->assertNotContains( '(booksources-invalid-isbn)', $html ); + $this->assertContains( '(booksources-text)', $html ); + } } diff --git a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php index cc16e5f7bd..c51217c5b9 100644 --- a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php +++ b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php @@ -22,9 +22,17 @@ class SpecialRecentchangesTest extends MediaWikiTestCase { protected $rc; /** helper to test SpecialRecentchanges::buildMainQueryConds() */ - private function assertConditions( $expected, $requestOptions = null, $message = '' ) { + private function assertConditions( + $expected, + $requestOptions = null, + $message = '', + $user = null + ) { $context = new RequestContext; $context->setRequest( new FauxRequest( $requestOptions ) ); + if ( $user ) { + $context->setUser( $user ); + } # setup the rc object $this->rc = new SpecialRecentChanges(); @@ -129,4 +137,82 @@ class SpecialRecentchangesTest extends MediaWikiTestCase { [ NS_TALK, NS_MAIN ], ]; } + + public function testRcHidemyselfFilter() { + $user = $this->getTestUser()->getUser(); + $this->assertConditions( + [ # expected + 'rc_bot' => 0, + 0 => "rc_user != '{$user->getId()}'", + 1 => "rc_type != '6'", + ], + [ + 'hidemyself' => 1, + ], + "rc conditions: hidemyself=1 (logged in)", + $user + ); + + $user = User::newFromName( '10.11.12.13', false ); + $this->assertConditions( + [ # expected + 'rc_bot' => 0, + 0 => "rc_user_text != '10.11.12.13'", + 1 => "rc_type != '6'", + ], + [ + 'hidemyself' => 1, + ], + "rc conditions: hidemyself=1 (anon)", + $user + ); + } + + public function testRcHidebyothersFilter() { + $user = $this->getTestUser()->getUser(); + $this->assertConditions( + [ # expected + 'rc_bot' => 0, + 0 => "rc_user = '{$user->getId()}'", + 1 => "rc_type != '6'", + ], + [ + 'hidebyothers' => 1, + ], + "rc conditions: hidebyothers=1 (logged in)", + $user + ); + + $user = User::newFromName( '10.11.12.13', false ); + $this->assertConditions( + [ # expected + 'rc_bot' => 0, + 0 => "rc_user_text = '10.11.12.13'", + 1 => "rc_type != '6'", + ], + [ + 'hidebyothers' => 1, + ], + "rc conditions: hidebyothers=1 (anon)", + $user + ); + } + + public function testRcHidemyselfHidebyothersFilter() { + $user = $this->getTestUser()->getUser(); + $this->assertConditions( + [ # expected + 'rc_bot' => 0, + 0 => "rc_user != '{$user->getId()}'", + 1 => "rc_user = '{$user->getId()}'", + 2 => "rc_type != '6'", + ], + [ + 'hidemyself' => 1, + 'hidebyothers' => 1, + ], + "rc conditions: hidemyself=1 hidebyothers=1 (logged in)", + $user + ); + } } diff --git a/tests/phpunit/includes/upload/UploadBaseTest.php b/tests/phpunit/includes/upload/UploadBaseTest.php index 3debe6e198..6be272fb61 100644 --- a/tests/phpunit/includes/upload/UploadBaseTest.php +++ b/tests/phpunit/includes/upload/UploadBaseTest.php @@ -349,7 +349,7 @@ class UploadBaseTest extends MediaWikiTestCase { ], [ // This currently doesn't seem to work in any browsers, but in case - // http://www.w3.org/TR/css3-images/ is implemented for SVG files + // https://www.w3.org/TR/css3-images/ is implemented for SVG files '', true, true, @@ -397,6 +397,46 @@ class UploadBaseTest extends MediaWikiTestCase { // @codingStandardsIgnoreEnd } + /** + * @dataProvider provideDetectScriptInSvg + */ + public function testDetectScriptInSvg( $svg, $expected, $message ) { + // This only checks some weird cases, most tests are in testCheckSvgScriptCallback() above + $result = $this->upload->detectScriptInSvg( $svg, false ); + $this->assertSame( $expected, $result, $message ); + } + + public static function provideDetectScriptInSvg() { + global $IP; + return [ + [ + "$IP/tests/phpunit/data/upload/buggynamespace-original.svg", + false, + 'SVG with a weird but valid namespace definition created by Adobe Illustrator' + ], + [ + "$IP/tests/phpunit/data/upload/buggynamespace-okay.svg", + false, + 'SVG with a namespace definition created by Adobe Illustrator and mangled by Inkscape' + ], + [ + "$IP/tests/phpunit/data/upload/buggynamespace-okay2.svg", + false, + 'SVG with a namespace definition created by Adobe Illustrator and mangled by Inkscape (twice)' + ], + [ + "$IP/tests/phpunit/data/upload/buggynamespace-bad.svg", + [ 'uploadscriptednamespace', 'i' ], + 'SVG with a namespace definition using an undefined entity' + ], + [ + "$IP/tests/phpunit/data/upload/buggynamespace-evilhtml.svg", + [ 'uploadscriptednamespace', 'http://www.w3.org/1999/xhtml' ], + 'SVG with an html namespace encoded as an entity' + ], + ]; + } + /** * @dataProvider provideCheckXMLEncodingMissmatch */ @@ -442,4 +482,11 @@ class UploadTestHandler extends UploadBase { ); return [ $check->wellFormed, $check->filterMatch ]; } + + /** + * Same as parent function, but override visibility to 'public'. + */ + public function detectScriptInSvg( $filename, $partial ) { + return parent::detectScriptInSvg( $filename, $partial ); + } } diff --git a/tests/phpunit/includes/user/BotPasswordTest.php b/tests/phpunit/includes/user/BotPasswordTest.php index cfd5f7890a..81c84e8306 100644 --- a/tests/phpunit/includes/user/BotPasswordTest.php +++ b/tests/phpunit/includes/user/BotPasswordTest.php @@ -1,6 +1,7 @@ assertNotNull( BotPassword::newFromCentralId( 43, 'BotPassword' ) ); } + /** + * @dataProvider provideCanonicalizeLoginData + */ + public function testCanonicalizeLoginData( $username, $password, $expectedResult ) { + $result = BotPassword::canonicalizeLoginData( $username, $password ); + if ( is_array( $expectedResult ) ) { + $this->assertArrayEquals( $expectedResult, $result, true, true ); + } else { + $this->assertSame( $expectedResult, $result ); + } + } + + public function provideCanonicalizeLoginData() { + return [ + [ 'user', 'pass', false ], + [ 'user', 'abc@def', false ], + [ 'legacy@user', 'pass', false ], + [ 'user@bot', '12345678901234567890123456789012', + [ 'user@bot', '12345678901234567890123456789012', true ] ], + [ 'user', 'bot@12345678901234567890123456789012', + [ 'user@bot', '12345678901234567890123456789012', true ] ], + [ 'user', 'bot@12345678901234567890123456789012345', + [ 'user@bot', '12345678901234567890123456789012345', true ] ], + [ 'user', 'bot@x@12345678901234567890123456789012', + [ 'user@bot@x', '12345678901234567890123456789012', true ] ], + ]; + } + public function testLogin() { // Test failure when bot passwords aren't enabled $this->setMwGlobals( 'wgEnableBotPasswords', false ); diff --git a/tests/phpunit/includes/user/PasswordResetTest.php b/tests/phpunit/includes/user/PasswordResetTest.php index 4db636b126..7ff882a5ad 100644 --- a/tests/phpunit/includes/user/PasswordResetTest.php +++ b/tests/phpunit/includes/user/PasswordResetTest.php @@ -11,7 +11,7 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase { */ public function testIsAllowed( $passwordResetRoutes, $enableEmail, $allowsAuthenticationDataChange, $canEditPrivate, $canSeePassword, - $userIsBlocked, $isAllowed, $isAllowedToDisplayPassword + $userIsBlocked, $isAllowed ) { $config = new HashConfig( [ 'PasswordResetRoutes' => $passwordResetRoutes, @@ -40,8 +40,6 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase { $passwordReset = new PasswordReset( $config, $authManager ); $this->assertSame( $isAllowed, $passwordReset->isAllowed( $user )->isGood() ); - $this->assertSame( $isAllowedToDisplayPassword, - $passwordReset->isAllowed( $user, true )->isGood() ); } public function provideIsAllowed() { @@ -54,7 +52,6 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase { 'canSeePassword' => true, 'userIsBlocked' => false, 'isAllowed' => false, - 'isAllowedToDisplayPassword' => false, ], [ 'passwordResetRoutes' => [ 'username' => true ], @@ -64,7 +61,6 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase { 'canSeePassword' => true, 'userIsBlocked' => false, 'isAllowed' => false, - 'isAllowedToDisplayPassword' => false, ], [ 'passwordResetRoutes' => [ 'username' => true ], @@ -74,7 +70,6 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase { 'canSeePassword' => true, 'userIsBlocked' => false, 'isAllowed' => false, - 'isAllowedToDisplayPassword' => false, ], [ 'passwordResetRoutes' => [ 'username' => true ], @@ -84,7 +79,6 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase { 'canSeePassword' => true, 'userIsBlocked' => false, 'isAllowed' => false, - 'isAllowedToDisplayPassword' => false, ], [ 'passwordResetRoutes' => [ 'username' => true ], @@ -94,7 +88,6 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase { 'canSeePassword' => true, 'userIsBlocked' => true, 'isAllowed' => false, - 'isAllowedToDisplayPassword' => false, ], [ 'passwordResetRoutes' => [ 'username' => true ], @@ -104,7 +97,6 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase { 'canSeePassword' => false, 'userIsBlocked' => false, 'isAllowed' => true, - 'isAllowedToDisplayPassword' => false, ], [ 'passwordResetRoutes' => [ 'username' => true ], @@ -114,7 +106,6 @@ class PasswordResetTest extends PHPUnit_Framework_TestCase { 'canSeePassword' => true, 'userIsBlocked' => false, 'isAllowed' => true, - 'isAllowedToDisplayPassword' => true, ], ]; } diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php index 985554b86d..0819bf255c 100644 --- a/tests/phpunit/includes/user/UserTest.php +++ b/tests/phpunit/includes/user/UserTest.php @@ -3,6 +3,8 @@ define( 'NS_UNITTEST', 5600 ); define( 'NS_UNITTEST_TALK', 5601 ); +use MediaWiki\MediaWikiServices; + /** * @group Database */ @@ -269,7 +271,13 @@ class UserTest extends MediaWikiTestCase { // let the user have a few (3) edits $page = WikiPage::factory( Title::newFromText( 'Help:UserTest_EditCount' ) ); for ( $i = 0; $i < 3; $i++ ) { - $page->doEdit( (string)$i, 'test', 0, false, $user ); + $page->doEditContent( + ContentHandler::makeContent( (string)$i, $page->getTitle() ), + 'test', + 0, + false, + $user + ); } $this->assertEquals( @@ -341,6 +349,12 @@ class UserTest extends MediaWikiTestCase { $user->saveSettings(); $user = User::newFromName( $user->getName() ); + $user->load( User::READ_LATEST ); + $this->assertEquals( 'test', $user->getOption( 'userjs-someoption' ) ); + $this->assertEquals( 200, $user->getOption( 'cols' ) ); + + $user = User::newFromName( $user->getName() ); + MediaWikiServices::getInstance()->getMainWANObjectCache()->clearProcessCache(); $this->assertEquals( 'test', $user->getOption( 'userjs-someoption' ) ); $this->assertEquals( 200, $user->getOption( 'cols' ) ); } @@ -498,7 +512,6 @@ class UserTest extends MediaWikiTestCase { public function testGetId() { $user = static::getTestUser()->getUser(); $this->assertTrue( $user->getId() > 0 ); - } /** @@ -573,4 +586,162 @@ class UserTest extends MediaWikiTestCase { $users->rewind(); $this->assertTrue( $user->equals( $users->current() ) ); } + + /** + * When a user is autoblocked a cookie is set with which to track them + * in case they log out and change IP addresses. + * @link https://phabricator.wikimedia.org/T5233 + */ + public function testAutoblockCookies() { + // Set up the bits of global configuration that we use. + $this->setMwGlobals( [ + 'wgCookieSetOnAutoblock' => true, + 'wgCookiePrefix' => 'wmsitetitle', + ] ); + + // 1. Log in a test user, and block them. + $user1tmp = $this->getTestUser()->getUser(); + $request1 = new FauxRequest(); + $request1->getSession()->setUser( $user1tmp ); + $expiryFiveDays = time() + ( 5 * 24 * 60 * 60 ); + $block = new Block( [ + 'enableAutoblock' => true, + 'expiry' => wfTimestamp( TS_MW, $expiryFiveDays ), + ] ); + $block->setTarget( $user1tmp ); + $block->insert(); + $user1 = User::newFromSession( $request1 ); + $user1->mBlock = $block; + $user1->load(); + + // Confirm that the block has been applied as required. + $this->assertTrue( $user1->isLoggedIn() ); + $this->assertTrue( $user1->isBlocked() ); + $this->assertEquals( Block::TYPE_USER, $block->getType() ); + $this->assertTrue( $block->isAutoblocking() ); + $this->assertGreaterThanOrEqual( 1, $block->getId() ); + + // Test for the desired cookie name, value, and expiry. + $cookies = $request1->response()->getCookies(); + $this->assertArrayHasKey( 'wmsitetitleBlockID', $cookies ); + $this->assertEquals( $block->getId(), $cookies['wmsitetitleBlockID']['value'] ); + $this->assertEquals( $expiryFiveDays, $cookies['wmsitetitleBlockID']['expire'] ); + + // 2. Create a new request, set the cookies, and see if the (anon) user is blocked. + $request2 = new FauxRequest(); + $request2->setCookie( 'BlockID', $block->getId() ); + $user2 = User::newFromSession( $request2 ); + $user2->load(); + $this->assertNotEquals( $user1->getId(), $user2->getId() ); + $this->assertNotEquals( $user1->getToken(), $user2->getToken() ); + $this->assertTrue( $user2->isAnon() ); + $this->assertFalse( $user2->isLoggedIn() ); + $this->assertTrue( $user2->isBlocked() ); + $this->assertEquals( true, $user2->getBlock()->isAutoblocking() ); // Non-strict type-check. + // Can't directly compare the objects becuase of member type differences. + // One day this will work: $this->assertEquals( $block, $user2->getBlock() ); + $this->assertEquals( $block->getId(), $user2->getBlock()->getId() ); + $this->assertEquals( $block->getExpiry(), $user2->getBlock()->getExpiry() ); + + // 3. Finally, set up a request as a new user, and the block should still be applied. + $user3tmp = $this->getTestUser()->getUser(); + $request3 = new FauxRequest(); + $request3->getSession()->setUser( $user3tmp ); + $request3->setCookie( 'BlockID', $block->getId() ); + $user3 = User::newFromSession( $request3 ); + $user3->load(); + $this->assertTrue( $user3->isLoggedIn() ); + $this->assertTrue( $user3->isBlocked() ); + $this->assertEquals( true, $user3->getBlock()->isAutoblocking() ); // Non-strict type-check. + + // Clean up. + $block->delete(); + } + + /** + * Make sure that no cookie is set to track autoblocked users + * when $wgCookieSetOnAutoblock is false. + */ + public function testAutoblockCookiesDisabled() { + // Set up the bits of global configuration that we use. + $this->setMwGlobals( [ + 'wgCookieSetOnAutoblock' => false, + 'wgCookiePrefix' => 'wm_no_cookies', + ] ); + + // 1. Log in a test user, and block them. + $testUser = $this->getTestUser()->getUser(); + $request1 = new FauxRequest(); + $request1->getSession()->setUser( $testUser ); + $block = new Block( [ 'enableAutoblock' => true ] ); + $block->setTarget( $testUser ); + $block->insert(); + $user = User::newFromSession( $request1 ); + $user->mBlock = $block; + $user->load(); + + // 2. Test that the cookie IS NOT present. + $this->assertTrue( $user->isLoggedIn() ); + $this->assertTrue( $user->isBlocked() ); + $this->assertEquals( Block::TYPE_USER, $block->getType() ); + $this->assertTrue( $block->isAutoblocking() ); + $this->assertGreaterThanOrEqual( 1, $user->getBlockId() ); + $this->assertGreaterThanOrEqual( $block->getId(), $user->getBlockId() ); + $cookies = $request1->response()->getCookies(); + $this->assertArrayNotHasKey( 'wm_no_cookiesBlockID', $cookies ); + + // Clean up. + $block->delete(); + } + + /** + * When a user is autoblocked and a cookie is set to track them, the expiry time of the cookie + * should match the block's expiry. If the block is infinite, the cookie expiry time should + * match $wgCookieExpiration. If the expiry time is changed, the cookie's should change with it. + */ + public function testAutoblockCookieInfiniteExpiry() { + $cookieExpiration = 20 * 24 * 60 * 60; // 20 days + $this->setMwGlobals( [ + 'wgCookieSetOnAutoblock' => true, + 'wgCookieExpiration' => $cookieExpiration, + 'wgCookiePrefix' => 'wm_infinite_block', + ] ); + // 1. Log in a test user, and block them indefinitely. + $user1Tmp = $this->getTestUser()->getUser(); + $request1 = new FauxRequest(); + $request1->getSession()->setUser( $user1Tmp ); + $block = new Block( [ 'enableAutoblock' => true, 'expiry' => 'infinity' ] ); + $block->setTarget( $user1Tmp ); + $block->insert(); + $user1 = User::newFromSession( $request1 ); + $user1->mBlock = $block; + $user1->load(); + + // 2. Test the cookie's expiry timestamp. + $this->assertTrue( $user1->isLoggedIn() ); + $this->assertTrue( $user1->isBlocked() ); + $this->assertEquals( Block::TYPE_USER, $block->getType() ); + $this->assertTrue( $block->isAutoblocking() ); + $this->assertGreaterThanOrEqual( 1, $user1->getBlockId() ); + $cookies = $request1->response()->getCookies(); + // Calculate the expected cookie expiry date. + $this->assertArrayHasKey( 'wm_infinite_blockBlockID', $cookies ); + $this->assertEquals( time() + $cookieExpiration, $cookies['wm_infinite_blockBlockID']['expire'] ); + + // 3. Change the block's expiry (to 2 days), and the cookie's should be changed also. + $newExpiry = time() + 2 * 24 * 60 * 60; + $block->mExpiry = wfTimestamp( TS_MW, $newExpiry ); + $block->update(); + $user2tmp = $this->getTestUser()->getUser(); + $request2 = new FauxRequest(); + $request2->getSession()->setUser( $user2tmp ); + $user2 = User::newFromSession( $request2 ); + $user2->mBlock = $block; + $user2->load(); + $cookies = $request2->response()->getCookies(); + $this->assertEquals( $newExpiry, $cookies['wm_infinite_blockBlockID']['expire'] ); + + // Clean up. + $block->delete(); + } } diff --git a/tests/phpunit/includes/utils/BatchRowUpdateTest.php b/tests/phpunit/includes/utils/BatchRowUpdateTest.php index 560b6d2fb6..cb1b3d2af6 100644 --- a/tests/phpunit/includes/utils/BatchRowUpdateTest.php +++ b/tests/phpunit/includes/utils/BatchRowUpdateTest.php @@ -81,7 +81,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase { */ public function testReaderGetPrimaryKey( $message, array $expected, array $row ) { $reader = new BatchRowIterator( $this->mockDb(), 'some_table', array_keys( $expected ), 8675309 ); - $this->assertEquals( $expected, $reader->extractPrimaryKeys( (object) $row ), $message ); + $this->assertEquals( $expected, $reader->extractPrimaryKeys( (object)$row ), $message ); } public static function provider_readerSetFetchColumns() { @@ -129,7 +129,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase { $db = $this->mockDb(); $db->expects( $this->once() ) ->method( 'select' ) - // only testing second parameter of DatabaseBase::select + // only testing second parameter of Database::select ->with( 'some_table', $columns ) ->will( $this->returnValue( new ArrayIterator( [] ) ) ); @@ -164,7 +164,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase { /** * Slightly hackish to use reflection, but asserting different parameters - * to consecutive calls of DatabaseBase::select in phpunit is error prone + * to consecutive calls of Database::select in phpunit is error prone * * @dataProvider provider_readerSelectConditions */ @@ -214,7 +214,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase { protected function consecutivelyReturnFromSelect( array $results ) { $retvals = []; foreach ( $results as $rows ) { - // The DatabaseBase::select method returns iterators, so we do too. + // The Database::select method returns iterators, so we do too. $retvals[] = $this->returnValue( new ArrayIterator( $rows ) ); } @@ -226,7 +226,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase { for ( $i = 0; $i < $numRows; $i += $batchSize ) { $rows = []; for ( $j = 0; $j < $batchSize && $i + $j < $numRows; $j++ ) { - $rows [] = (object) call_user_func( $rowGenerator ); + $rows [] = (object)call_user_func( $rowGenerator ); } $res[] = $rows; } @@ -235,8 +235,7 @@ class BatchRowUpdateTest extends MediaWikiTestCase { } protected function mockDb() { - // Cant mock from DatabaseType or DatabaseBase, they dont - // have the full gamut of methods + // @TODO: mock from Database // FIXME: the constructor normally sets mAtomicLevels and mSrvCache $databaseMysql = $this->getMockBuilder( 'DatabaseMysql' ) ->disableOriginalConstructor() diff --git a/tests/phpunit/includes/utils/FileContentsHasherTest.php b/tests/phpunit/includes/utils/FileContentsHasherTest.php index 2de4bffbe6..0ee4c1342d 100644 --- a/tests/phpunit/includes/utils/FileContentsHasherTest.php +++ b/tests/phpunit/includes/utils/FileContentsHasherTest.php @@ -3,7 +3,7 @@ /** * @covers FileContentsHasherTest */ -class FileContentsHasherTest extends MediaWikiTestCase { +class FileContentsHasherTest extends PHPUnit_Framework_TestCase { public function provideSingleFile() { return array_map( function ( $file ) { diff --git a/tests/phpunit/includes/utils/IPTest.php b/tests/phpunit/includes/utils/IPTest.php deleted file mode 100644 index 5e0626b6bb..0000000000 --- a/tests/phpunit/includes/utils/IPTest.php +++ /dev/null @@ -1,670 +0,0 @@ -assertFalse( IP::isIPAddress( $val ), $desc ); - } - - /** - * Provide a list of things that aren't IP addresses - */ - public function provideInvalidIPs() { - return [ - [ false, 'Boolean false is not an IP' ], - [ true, 'Boolean true is not an IP' ], - [ '', 'Empty string is not an IP' ], - [ 'abc', 'Garbage IP string' ], - [ ':', 'Single ":" is not an IP' ], - [ '2001:0DB8::A:1::1', 'IPv6 with a double :: occurrence' ], - [ '2001:0DB8::A:1::', 'IPv6 with a double :: occurrence, last at end' ], - [ '::2001:0DB8::5:1', 'IPv6 with a double :: occurrence, firt at beginning' ], - [ '124.24.52', 'IPv4 not enough quads' ], - [ '24.324.52.13', 'IPv4 out of range' ], - [ '.24.52.13', 'IPv4 starts with period' ], - [ 'fc:100:300', 'IPv6 with only 3 words' ], - ]; - } - - /** - * @covers IP::isIPAddress - */ - public function testisIPAddress() { - $this->assertTrue( IP::isIPAddress( '::' ), 'RFC 4291 IPv6 Unspecified Address' ); - $this->assertTrue( IP::isIPAddress( '::1' ), 'RFC 4291 IPv6 Loopback Address' ); - $this->assertTrue( IP::isIPAddress( '74.24.52.13/20', 'IPv4 range' ) ); - $this->assertTrue( IP::isIPAddress( 'fc:100:a:d:1:e:ac:0/24' ), 'IPv6 range' ); - $this->assertTrue( IP::isIPAddress( 'fc::100:a:d:1:e:ac/96' ), 'IPv6 range with "::"' ); - - $validIPs = [ 'fc:100::', 'fc:100:a:d:1:e:ac::', 'fc::100', '::fc:100:a:d:1:e:ac', - '::fc', 'fc::100:a:d:1:e:ac', 'fc:100:a:d:1:e:ac:0', '124.24.52.13', '1.24.52.13' ]; - foreach ( $validIPs as $ip ) { - $this->assertTrue( IP::isIPAddress( $ip ), "$ip is a valid IP address" ); - } - } - - /** - * @covers IP::isIPv6 - */ - public function testisIPv6() { - $this->assertFalse( IP::isIPv6( ':fc:100::' ), 'IPv6 starting with lone ":"' ); - $this->assertFalse( IP::isIPv6( 'fc:100:::' ), 'IPv6 ending with a ":::"' ); - $this->assertFalse( IP::isIPv6( 'fc:300' ), 'IPv6 with only 2 words' ); - $this->assertFalse( IP::isIPv6( 'fc:100:300' ), 'IPv6 with only 3 words' ); - - $this->assertTrue( IP::isIPv6( 'fc:100::' ) ); - $this->assertTrue( IP::isIPv6( 'fc:100:a::' ) ); - $this->assertTrue( IP::isIPv6( 'fc:100:a:d::' ) ); - $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1::' ) ); - $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e::' ) ); - $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e:ac::' ) ); - - $this->assertFalse( IP::isIPv6( 'fc:100:a:d:1:e:ac:0::' ), 'IPv6 with 8 words ending with "::"' ); - $this->assertFalse( - IP::isIPv6( 'fc:100:a:d:1:e:ac:0:1::' ), - 'IPv6 with 9 words ending with "::"' - ); - - $this->assertFalse( IP::isIPv6( ':::' ) ); - $this->assertFalse( IP::isIPv6( '::0:' ), 'IPv6 ending in a lone ":"' ); - - $this->assertTrue( IP::isIPv6( '::' ), 'IPv6 zero address' ); - $this->assertTrue( IP::isIPv6( '::0' ) ); - $this->assertTrue( IP::isIPv6( '::fc' ) ); - $this->assertTrue( IP::isIPv6( '::fc:100' ) ); - $this->assertTrue( IP::isIPv6( '::fc:100:a' ) ); - $this->assertTrue( IP::isIPv6( '::fc:100:a:d' ) ); - $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1' ) ); - $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1:e' ) ); - $this->assertTrue( IP::isIPv6( '::fc:100:a:d:1:e:ac' ) ); - - $this->assertFalse( IP::isIPv6( '::fc:100:a:d:1:e:ac:0' ), 'IPv6 with "::" and 8 words' ); - $this->assertFalse( IP::isIPv6( '::fc:100:a:d:1:e:ac:0:1' ), 'IPv6 with 9 words' ); - - $this->assertFalse( IP::isIPv6( ':fc::100' ), 'IPv6 starting with lone ":"' ); - $this->assertFalse( IP::isIPv6( 'fc::100:' ), 'IPv6 ending with lone ":"' ); - $this->assertFalse( IP::isIPv6( 'fc:::100' ), 'IPv6 with ":::" in the middle' ); - - $this->assertTrue( IP::isIPv6( 'fc::100' ), 'IPv6 with "::" and 2 words' ); - $this->assertTrue( IP::isIPv6( 'fc::100:a' ), 'IPv6 with "::" and 3 words' ); - $this->assertTrue( IP::isIPv6( 'fc::100:a:d', 'IPv6 with "::" and 4 words' ) ); - $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1' ), 'IPv6 with "::" and 5 words' ); - $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e' ), 'IPv6 with "::" and 6 words' ); - $this->assertTrue( IP::isIPv6( 'fc::100:a:d:1:e:ac' ), 'IPv6 with "::" and 7 words' ); - $this->assertTrue( IP::isIPv6( '2001::df' ), 'IPv6 with "::" and 2 words' ); - $this->assertTrue( IP::isIPv6( '2001:5c0:1400:a::df' ), 'IPv6 with "::" and 5 words' ); - $this->assertTrue( IP::isIPv6( '2001:5c0:1400:a::df:2' ), 'IPv6 with "::" and 6 words' ); - - $this->assertFalse( IP::isIPv6( 'fc::100:a:d:1:e:ac:0' ), 'IPv6 with "::" and 8 words' ); - $this->assertFalse( IP::isIPv6( 'fc::100:a:d:1:e:ac:0:1' ), 'IPv6 with 9 words' ); - - $this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e:ac:0' ) ); - } - - /** - * @covers IP::isIPv4 - * @dataProvider provideInvalidIPv4Addresses - */ - public function testisNotIPv4( $bogusIP, $desc ) { - $this->assertFalse( IP::isIPv4( $bogusIP ), $desc ); - } - - public function provideInvalidIPv4Addresses() { - return [ - [ false, 'Boolean false is not an IP' ], - [ true, 'Boolean true is not an IP' ], - [ '', 'Empty string is not an IP' ], - [ 'abc', 'Letters are not an IP' ], - [ ':', 'A colon is not an IP' ], - [ '124.24.52', 'IPv4 not enough quads' ], - [ '24.324.52.13', 'IPv4 out of range' ], - [ '.24.52.13', 'IPv4 starts with period' ], - ]; - } - - /** - * @covers IP::isIPv4 - * @dataProvider provideValidIPv4Address - */ - public function testIsIPv4( $ip, $desc ) { - $this->assertTrue( IP::isIPv4( $ip ), $desc ); - } - - /** - * Provide some IPv4 addresses and ranges - */ - public function provideValidIPv4Address() { - return [ - [ '124.24.52.13', 'Valid IPv4 address' ], - [ '1.24.52.13', 'Another valid IPv4 address' ], - [ '74.24.52.13/20', 'An IPv4 range' ], - ]; - } - - /** - * @covers IP::isValid - */ - public function testValidIPs() { - foreach ( range( 0, 255 ) as $i ) { - $a = sprintf( "%03d", $i ); - $b = sprintf( "%02d", $i ); - $c = sprintf( "%01d", $i ); - foreach ( array_unique( [ $a, $b, $c ] ) as $f ) { - $ip = "$f.$f.$f.$f"; - $this->assertTrue( IP::isValid( $ip ), "$ip is a valid IPv4 address" ); - } - } - foreach ( range( 0x0, 0xFFFF, 0xF ) as $i ) { - $a = sprintf( "%04x", $i ); - $b = sprintf( "%03x", $i ); - $c = sprintf( "%02x", $i ); - foreach ( array_unique( [ $a, $b, $c ] ) as $f ) { - $ip = "$f:$f:$f:$f:$f:$f:$f:$f"; - $this->assertTrue( IP::isValid( $ip ), "$ip is a valid IPv6 address" ); - } - } - // test with some abbreviations - $this->assertFalse( IP::isValid( ':fc:100::' ), 'IPv6 starting with lone ":"' ); - $this->assertFalse( IP::isValid( 'fc:100:::' ), 'IPv6 ending with a ":::"' ); - $this->assertFalse( IP::isValid( 'fc:300' ), 'IPv6 with only 2 words' ); - $this->assertFalse( IP::isValid( 'fc:100:300' ), 'IPv6 with only 3 words' ); - - $this->assertTrue( IP::isValid( 'fc:100::' ) ); - $this->assertTrue( IP::isValid( 'fc:100:a:d:1:e::' ) ); - $this->assertTrue( IP::isValid( 'fc:100:a:d:1:e:ac::' ) ); - - $this->assertTrue( IP::isValid( 'fc::100' ), 'IPv6 with "::" and 2 words' ); - $this->assertTrue( IP::isValid( 'fc::100:a' ), 'IPv6 with "::" and 3 words' ); - $this->assertTrue( IP::isValid( '2001::df' ), 'IPv6 with "::" and 2 words' ); - $this->assertTrue( IP::isValid( '2001:5c0:1400:a::df' ), 'IPv6 with "::" and 5 words' ); - $this->assertTrue( IP::isValid( '2001:5c0:1400:a::df:2' ), 'IPv6 with "::" and 6 words' ); - $this->assertTrue( IP::isValid( 'fc::100:a:d:1' ), 'IPv6 with "::" and 5 words' ); - $this->assertTrue( IP::isValid( 'fc::100:a:d:1:e:ac' ), 'IPv6 with "::" and 7 words' ); - - $this->assertFalse( - IP::isValid( 'fc:100:a:d:1:e:ac:0::' ), - 'IPv6 with 8 words ending with "::"' - ); - $this->assertFalse( - IP::isValid( 'fc:100:a:d:1:e:ac:0:1::' ), - 'IPv6 with 9 words ending with "::"' - ); - } - - /** - * @covers IP::isValid - */ - public function testInvalidIPs() { - // Out of range... - foreach ( range( 256, 999 ) as $i ) { - $a = sprintf( "%03d", $i ); - $b = sprintf( "%02d", $i ); - $c = sprintf( "%01d", $i ); - foreach ( array_unique( [ $a, $b, $c ] ) as $f ) { - $ip = "$f.$f.$f.$f"; - $this->assertFalse( IP::isValid( $ip ), "$ip is not a valid IPv4 address" ); - } - } - foreach ( range( 'g', 'z' ) as $i ) { - $a = sprintf( "%04s", $i ); - $b = sprintf( "%03s", $i ); - $c = sprintf( "%02s", $i ); - foreach ( array_unique( [ $a, $b, $c ] ) as $f ) { - $ip = "$f:$f:$f:$f:$f:$f:$f:$f"; - $this->assertFalse( IP::isValid( $ip ), "$ip is not a valid IPv6 address" ); - } - } - // Have CIDR - $ipCIDRs = [ - '212.35.31.121/32', - '212.35.31.121/18', - '212.35.31.121/24', - '::ff:d:321:5/96', - 'ff::d3:321:5/116', - 'c:ff:12:1:ea:d:321:5/120', - ]; - foreach ( $ipCIDRs as $i ) { - $this->assertFalse( IP::isValid( $i ), - "$i is an invalid IP address because it is a block" ); - } - // Incomplete/garbage - $invalid = [ - 'www.xn--var-xla.net', - '216.17.184.G', - '216.17.184.1.', - '216.17.184', - '216.17.184.', - '256.17.184.1' - ]; - foreach ( $invalid as $i ) { - $this->assertFalse( IP::isValid( $i ), "$i is an invalid IP address" ); - } - } - - /** - * Provide some valid IP blocks - */ - public function provideValidBlocks() { - return [ - [ '116.17.184.5/32' ], - [ '0.17.184.5/30' ], - [ '16.17.184.1/24' ], - [ '30.242.52.14/1' ], - [ '10.232.52.13/8' ], - [ '30.242.52.14/0' ], - [ '::e:f:2001/96' ], - [ '::c:f:2001/128' ], - [ '::10:f:2001/70' ], - [ '::fe:f:2001/1' ], - [ '::6d:f:2001/8' ], - [ '::fe:f:2001/0' ], - ]; - } - - /** - * @covers IP::isValidBlock - * @dataProvider provideValidBlocks - */ - public function testValidBlocks( $block ) { - $this->assertTrue( IP::isValidBlock( $block ), "$block is a valid IP block" ); - } - - /** - * @covers IP::isValidBlock - * @dataProvider provideInvalidBlocks - */ - public function testInvalidBlocks( $invalid ) { - $this->assertFalse( IP::isValidBlock( $invalid ), "$invalid is not a valid IP block" ); - } - - public function provideInvalidBlocks() { - return [ - [ '116.17.184.5/33' ], - [ '0.17.184.5/130' ], - [ '16.17.184.1/-1' ], - [ '10.232.52.13/*' ], - [ '7.232.52.13/ab' ], - [ '11.232.52.13/' ], - [ '::e:f:2001/129' ], - [ '::c:f:2001/228' ], - [ '::10:f:2001/-1' ], - [ '::6d:f:2001/*' ], - [ '::86:f:2001/ab' ], - [ '::23:f:2001/' ], - ]; - } - - /** - * @covers IP::sanitizeIP - * @dataProvider provideSanitizeIP - */ - public function testSanitizeIP( $expected, $input ) { - $result = IP::sanitizeIP( $input ); - $this->assertEquals( $expected, $result ); - } - - /** - * Provider for IP::testSanitizeIP() - */ - public static function provideSanitizeIP() { - return [ - [ '0.0.0.0', '0.0.0.0' ], - [ '0.0.0.0', '00.00.00.00' ], - [ '0.0.0.0', '000.000.000.000' ], - [ '141.0.11.253', '141.000.011.253' ], - [ '1.2.4.5', '1.2.4.5' ], - [ '1.2.4.5', '01.02.04.05' ], - [ '1.2.4.5', '001.002.004.005' ], - [ '10.0.0.1', '010.0.000.1' ], - [ '80.72.250.4', '080.072.250.04' ], - [ 'Foo.1000.00', 'Foo.1000.00' ], - [ 'Bar.01', 'Bar.01' ], - [ 'Bar.010', 'Bar.010' ], - [ null, '' ], - [ null, ' ' ] - ]; - } - - /** - * @covers IP::toHex - * @dataProvider provideToHex - */ - public function testToHex( $expected, $input ) { - $result = IP::toHex( $input ); - $this->assertTrue( $result === false || is_string( $result ) ); - $this->assertEquals( $expected, $result ); - } - - /** - * Provider for IP::testToHex() - */ - public static function provideToHex() { - return [ - [ '00000001', '0.0.0.1' ], - [ '01020304', '1.2.3.4' ], - [ '7F000001', '127.0.0.1' ], - [ '80000000', '128.0.0.0' ], - [ 'DEADCAFE', '222.173.202.254' ], - [ 'FFFFFFFF', '255.255.255.255' ], - [ '8D000BFD', '141.000.11.253' ], - [ false, 'IN.VA.LI.D' ], - [ 'v6-00000000000000000000000000000001', '::1' ], - [ 'v6-20010DB885A3000000008A2E03707334', '2001:0db8:85a3:0000:0000:8a2e:0370:7334' ], - [ 'v6-20010DB885A3000000008A2E03707334', '2001:db8:85a3::8a2e:0370:7334' ], - [ false, 'IN:VA::LI:D' ], - [ false, ':::1' ] - ]; - } - - /** - * @covers IP::isPublic - * @dataProvider provideIsPublic - */ - public function testIsPublic( $expected, $input ) { - $result = IP::isPublic( $input ); - $this->assertEquals( $expected, $result ); - } - - /** - * Provider for IP::testIsPublic() - */ - public static function provideIsPublic() { - return [ - [ false, 'fc00::3' ], # RFC 4193 (local) - [ false, 'fc00::ff' ], # RFC 4193 (local) - [ false, '127.1.2.3' ], # loopback - [ false, '::1' ], # loopback - [ false, 'fe80::1' ], # link-local - [ false, '169.254.1.1' ], # link-local - [ false, '10.0.0.1' ], # RFC 1918 (private) - [ false, '172.16.0.1' ], # RFC 1918 (private) - [ false, '192.168.0.1' ], # RFC 1918 (private) - [ true, '2001:5c0:1000:a::133' ], # public - [ true, 'fc::3' ], # public - [ true, '00FC::' ] # public - ]; - } - - // Private wrapper used to test CIDR Parsing. - private function assertFalseCIDR( $CIDR, $msg = '' ) { - $ff = [ false, false ]; - $this->assertEquals( $ff, IP::parseCIDR( $CIDR ), $msg ); - } - - // Private wrapper to test network shifting using only dot notation - private function assertNet( $expected, $CIDR ) { - $parse = IP::parseCIDR( $CIDR ); - $this->assertEquals( $expected, long2ip( $parse[0] ), "network shifting $CIDR" ); - } - - /** - * @covers IP::hexToQuad - * @dataProvider provideIPsAndHexes - */ - public function testHexToQuad( $ip, $hex ) { - $this->assertEquals( $ip, IP::hexToQuad( $hex ) ); - } - - /** - * Provide some IP addresses and their equivalent hex representations - */ - public function provideIPsandHexes() { - return [ - [ '0.0.0.1', '00000001' ], - [ '255.0.0.0', 'FF000000' ], - [ '255.255.255.255', 'FFFFFFFF' ], - [ '10.188.222.255', '0ABCDEFF' ], - // hex not left-padded... - [ '0.0.0.0', '0' ], - [ '0.0.0.1', '1' ], - [ '0.0.0.255', 'FF' ], - [ '0.0.255.0', 'FF00' ], - ]; - } - - /** - * @covers IP::hexToOctet - * @dataProvider provideOctetsAndHexes - */ - public function testHexToOctet( $octet, $hex ) { - $this->assertEquals( $octet, IP::hexToOctet( $hex ) ); - } - - /** - * Provide some hex and octet representations of the same IPs - */ - public function provideOctetsAndHexes() { - return [ - [ '0:0:0:0:0:0:0:1', '00000000000000000000000000000001' ], - [ '0:0:0:0:0:0:FF:3', '00000000000000000000000000FF0003' ], - [ '0:0:0:0:0:0:FF00:6', '000000000000000000000000FF000006' ], - [ '0:0:0:0:0:0:FCCF:FAFF', '000000000000000000000000FCCFFAFF' ], - [ 'FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF', 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' ], - // hex not left-padded... - [ '0:0:0:0:0:0:0:0', '0' ], - [ '0:0:0:0:0:0:0:1', '1' ], - [ '0:0:0:0:0:0:0:FF', 'FF' ], - [ '0:0:0:0:0:0:0:FFD0', 'FFD0' ], - [ '0:0:0:0:0:0:FA00:0', 'FA000000' ], - [ '0:0:0:0:0:0:FCCF:FAFF', 'FCCFFAFF' ], - ]; - } - - /** - * IP::parseCIDR() returns an array containing a signed IP address - * representing the network mask and the bit mask. - * @covers IP::parseCIDR - */ - public function testCIDRParsing() { - $this->assertFalseCIDR( '192.0.2.0', "missing mask" ); - $this->assertFalseCIDR( '192.0.2.0/', "missing bitmask" ); - - // Verify if statement - $this->assertFalseCIDR( '256.0.0.0/32', "invalid net" ); - $this->assertFalseCIDR( '192.0.2.0/AA', "mask not numeric" ); - $this->assertFalseCIDR( '192.0.2.0/-1', "mask < 0" ); - $this->assertFalseCIDR( '192.0.2.0/33', "mask > 32" ); - - // Check internal logic - # 0 mask always result in array(0,0) - $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '192.0.0.2/0' ) ); - $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '0.0.0.0/0' ) ); - $this->assertEquals( [ 0, 0 ], IP::parseCIDR( '255.255.255.255/0' ) ); - - // @todo FIXME: Add more tests. - - # This part test network shifting - $this->assertNet( '192.0.0.0', '192.0.0.2/24' ); - $this->assertNet( '192.168.5.0', '192.168.5.13/24' ); - $this->assertNet( '10.0.0.160', '10.0.0.161/28' ); - $this->assertNet( '10.0.0.0', '10.0.0.3/28' ); - $this->assertNet( '10.0.0.0', '10.0.0.3/30' ); - $this->assertNet( '10.0.0.4', '10.0.0.4/30' ); - $this->assertNet( '172.17.32.0', '172.17.35.48/21' ); - $this->assertNet( '10.128.0.0', '10.135.0.0/9' ); - $this->assertNet( '134.0.0.0', '134.0.5.1/8' ); - } - - /** - * @covers IP::canonicalize - */ - public function testIPCanonicalizeOnValidIp() { - $this->assertEquals( '192.0.2.152', IP::canonicalize( '192.0.2.152' ), - 'Canonicalization of a valid IP returns it unchanged' ); - } - - /** - * @covers IP::canonicalize - */ - public function testIPCanonicalizeMappedAddress() { - $this->assertEquals( - '192.0.2.152', - IP::canonicalize( '::ffff:192.0.2.152' ) - ); - $this->assertEquals( - '192.0.2.152', - IP::canonicalize( '::192.0.2.152' ) - ); - } - - /** - * Issues there are most probably from IP::toHex() or IP::parseRange() - * @covers IP::isInRange - * @dataProvider provideIPsAndRanges - */ - public function testIPIsInRange( $expected, $addr, $range, $message = '' ) { - $this->assertEquals( - $expected, - IP::isInRange( $addr, $range ), - $message - ); - } - - /** Provider for testIPIsInRange() */ - public static function provideIPsAndRanges() { - # Format: (expected boolean, address, range, optional message) - return [ - # IPv4 - [ true, '192.0.2.0', '192.0.2.0/24', 'Network address' ], - [ true, '192.0.2.77', '192.0.2.0/24', 'Simple address' ], - [ true, '192.0.2.255', '192.0.2.0/24', 'Broadcast address' ], - - [ false, '0.0.0.0', '192.0.2.0/24' ], - [ false, '255.255.255', '192.0.2.0/24' ], - - # IPv6 - [ false, '::1', '2001:DB8::/32' ], - [ false, '::', '2001:DB8::/32' ], - [ false, 'FE80::1', '2001:DB8::/32' ], - - [ true, '2001:DB8::', '2001:DB8::/32' ], - [ true, '2001:0DB8::', '2001:DB8::/32' ], - [ true, '2001:DB8::1', '2001:DB8::/32' ], - [ true, '2001:0DB8::1', '2001:DB8::/32' ], - [ true, '2001:0DB8:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF', - '2001:DB8::/32' ], - - [ false, '2001:0DB8:F::', '2001:DB8::/96' ], - ]; - } - - /** - * Test for IP::splitHostAndPort(). - * @dataProvider provideSplitHostAndPort - */ - public function testSplitHostAndPort( $expected, $input, $description ) { - $this->assertEquals( $expected, IP::splitHostAndPort( $input ), $description ); - } - - /** - * Provider for IP::splitHostAndPort() - */ - public static function provideSplitHostAndPort() { - return [ - [ false, '[', 'Unclosed square bracket' ], - [ false, '[::', 'Unclosed square bracket 2' ], - [ [ '::', false ], '::', 'Bare IPv6 0' ], - [ [ '::1', false ], '::1', 'Bare IPv6 1' ], - [ [ '::', false ], '[::]', 'Bracketed IPv6 0' ], - [ [ '::1', false ], '[::1]', 'Bracketed IPv6 1' ], - [ [ '::1', 80 ], '[::1]:80', 'Bracketed IPv6 with port' ], - [ false, '::x', 'Double colon but no IPv6' ], - [ [ 'x', 80 ], 'x:80', 'Hostname and port' ], - [ false, 'x:x', 'Hostname and invalid port' ], - [ [ 'x', false ], 'x', 'Plain hostname' ] - ]; - } - - /** - * Test for IP::combineHostAndPort() - * @dataProvider provideCombineHostAndPort - */ - public function testCombineHostAndPort( $expected, $input, $description ) { - list( $host, $port, $defaultPort ) = $input; - $this->assertEquals( - $expected, - IP::combineHostAndPort( $host, $port, $defaultPort ), - $description ); - } - - /** - * Provider for IP::combineHostAndPort() - */ - public static function provideCombineHostAndPort() { - return [ - [ '[::1]', [ '::1', 2, 2 ], 'IPv6 default port' ], - [ '[::1]:2', [ '::1', 2, 3 ], 'IPv6 non-default port' ], - [ 'x', [ 'x', 2, 2 ], 'Normal default port' ], - [ 'x:2', [ 'x', 2, 3 ], 'Normal non-default port' ], - ]; - } - - /** - * Test for IP::sanitizeRange() - * @dataProvider provideIPCIDRs - */ - public function testSanitizeRange( $input, $expected, $description ) { - $this->assertEquals( $expected, IP::sanitizeRange( $input ), $description ); - } - - /** - * Provider for IP::testSanitizeRange() - */ - public static function provideIPCIDRs() { - return [ - [ '35.56.31.252/16', '35.56.0.0/16', 'IPv4 range' ], - [ '135.16.21.252/24', '135.16.21.0/24', 'IPv4 range' ], - [ '5.36.71.252/32', '5.36.71.252/32', 'IPv4 silly range' ], - [ '5.36.71.252', '5.36.71.252', 'IPv4 non-range' ], - [ '0:1:2:3:4:c5:f6:7/96', '0:1:2:3:4:C5:0:0/96', 'IPv6 range' ], - [ '0:1:2:3:4:5:6:7/120', '0:1:2:3:4:5:6:0/120', 'IPv6 range' ], - [ '0:e1:2:3:4:5:e6:7/128', '0:E1:2:3:4:5:E6:7/128', 'IPv6 silly range' ], - [ '0:c1:A2:3:4:5:c6:7', '0:C1:A2:3:4:5:C6:7', 'IPv6 non range' ], - ]; - } - - /** - * Test for IP::prettifyIP() - * @dataProvider provideIPsToPrettify - */ - public function testPrettifyIP( $ip, $prettified ) { - $this->assertEquals( $prettified, IP::prettifyIP( $ip ), "Prettify of $ip" ); - } - - /** - * Provider for IP::testPrettifyIP() - */ - public static function provideIPsToPrettify() { - return [ - [ '0:0:0:0:0:0:0:0', '::' ], - [ '0:0:0::0:0:0', '::' ], - [ '0:0:0:1:0:0:0:0', '0:0:0:1::' ], - [ '0:0::f', '::f' ], - [ '0::0:0:0:33:fef:b', '::33:fef:b' ], - [ '3f:535:0:0:0:0:e:fbb', '3f:535::e:fbb' ], - [ '0:0:fef:0:0:0:e:fbb', '0:0:fef::e:fbb' ], - [ 'abbc:2004::0:0:0:0', 'abbc:2004::' ], - [ 'cebc:2004:f:0:0:0:0:0', 'cebc:2004:f::' ], - [ '0:0:0:0:0:0:0:0/16', '::/16' ], - [ '0:0:0::0:0:0/64', '::/64' ], - [ '0:0::f/52', '::f/52' ], - [ '::0:0:33:fef:b/52', '::33:fef:b/52' ], - [ '3f:535:0:0:0:0:e:fbb/48', '3f:535::e:fbb/48' ], - [ '0:0:fef:0:0:0:e:fbb/96', '0:0:fef::e:fbb/96' ], - [ 'abbc:2004:0:0::0:0/40', 'abbc:2004::/40' ], - [ 'aebc:2004:f:0:0:0:0:0/80', 'aebc:2004:f::/80' ], - ]; - } -} diff --git a/tests/phpunit/includes/utils/MWCryptHKDFTest.php b/tests/phpunit/includes/utils/MWCryptHKDFTest.php index fafd4fa18e..760d41e86c 100644 --- a/tests/phpunit/includes/utils/MWCryptHKDFTest.php +++ b/tests/phpunit/includes/utils/MWCryptHKDFTest.php @@ -37,7 +37,7 @@ class MWCryptHKDFTest extends MediaWikiTestCase { } /** - * Test vectors from Appendix A on http://tools.ietf.org/html/rfc5869 + * Test vectors from Appendix A on https://tools.ietf.org/html/rfc5869 */ public static function providerRfc5869() { diff --git a/tests/phpunit/includes/utils/MWCryptHashTest.php b/tests/phpunit/includes/utils/MWCryptHashTest.php index 4c85c3dc79..905d14ca09 100644 --- a/tests/phpunit/includes/utils/MWCryptHashTest.php +++ b/tests/phpunit/includes/utils/MWCryptHashTest.php @@ -4,7 +4,7 @@ * @group Hash */ -class MWCryptHashTest extends MediaWikiTestCase { +class MWCryptHashTest extends PHPUnit_Framework_TestCase { public function testHashLength() { if ( MWCryptHash::hashAlgo() !== 'whirlpool' ) { diff --git a/tests/phpunit/languages/classes/LanguageTrTest.php b/tests/phpunit/languages/classes/LanguageTrTest.php index 206e608047..9a1823b1cd 100644 --- a/tests/phpunit/languages/classes/LanguageTrTest.php +++ b/tests/phpunit/languages/classes/LanguageTrTest.php @@ -14,7 +14,7 @@ class LanguageTrTest extends LanguageClassesTestCase { * - berm * - []LuCkY[] * - Emperyan - * @see http://en.wikipedia.org/wiki/Dotted_and_dotless_I + * @see https://en.wikipedia.org/wiki/Dotted_and_dotless_I * @dataProvider provideDottedAndDotlessI * @covers Language::ucfirst * @covers Language::lcfirst @@ -49,7 +49,7 @@ class LanguageTrTest extends LanguageClassesTestCase { [ 'lcfirst', 'i', 'lower', 'i' ], # A real example taken from bug 28040 using - # http://tr.wikipedia.org/wiki/%C4%B0Phone + # https://tr.wikipedia.org/wiki/%C4%B0Phone [ 'lcfirst', 'iPhone', 'lower', 'iPhone' ], # next case is valid in Turkish but are different words if we diff --git a/tests/phpunit/maintenance/MaintenanceTest.php b/tests/phpunit/maintenance/MaintenanceTest.php index bd10856943..cbf94d65d6 100644 --- a/tests/phpunit/maintenance/MaintenanceTest.php +++ b/tests/phpunit/maintenance/MaintenanceTest.php @@ -5,6 +5,7 @@ // without changing the visibility and without working around hacks in // Maintenance.php // For the same reason, we cannot just use FakeMaintenance. +use MediaWiki\MediaWikiServices; /** * makes parts of the API of Maintenance that is hidden by protected visibily @@ -826,7 +827,7 @@ class MaintenanceTest extends MediaWikiTestCase { public function testGetConfig() { $this->assertInstanceOf( 'Config', $this->m->getConfig() ); $this->assertSame( - ConfigFactory::getDefaultInstance()->makeConfig( 'main' ), + MediaWikiServices::getInstance()->getMainConfig(), $this->m->getConfig() ); } diff --git a/tests/phpunit/mocks/filebackend/MockFSFile.php b/tests/phpunit/mocks/filebackend/MockFSFile.php index bdeed58a81..6797f59554 100644 --- a/tests/phpunit/mocks/filebackend/MockFSFile.php +++ b/tests/phpunit/mocks/filebackend/MockFSFile.php @@ -50,15 +50,11 @@ class MockFSFile extends FSFile { return wfTimestamp( TS_MW ); } - public function getMimeType() { - return 'text/mock'; - } - public function getProps( $ext = true ) { return [ 'fileExists' => $this->exists(), 'size' => $this->getSize(), - 'file-mime' => $this->getMimeType(), + 'file-mime' => 'text/mock', 'sha1' => $this->getSha1Base36(), ]; } diff --git a/tests/phpunit/mocks/filerepo/MockLocalRepo.php b/tests/phpunit/mocks/filerepo/MockLocalRepo.php new file mode 100644 index 0000000000..eeaf05a0aa --- /dev/null +++ b/tests/phpunit/mocks/filerepo/MockLocalRepo.php @@ -0,0 +1,23 @@ +getLocalReference( $virtualUrl ); + + return $fsFile->getProps(); + } +} diff --git a/tests/phpunit/mocks/media/MockDjVuHandler.php b/tests/phpunit/mocks/media/MockDjVuHandler.php index 018d978fc3..0e0b9435cd 100644 --- a/tests/phpunit/mocks/media/MockDjVuHandler.php +++ b/tests/phpunit/mocks/media/MockDjVuHandler.php @@ -22,6 +22,10 @@ */ class MockDjVuHandler extends DjVuHandler { + function isEnabled() { + return true; + } + function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) { if ( !$this->normaliseParams( $image, $params ) ) { return new TransformParameterError( $params ); diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php index a70946af81..d8171044f3 100755 --- a/tests/phpunit/phpunit.php +++ b/tests/phpunit/phpunit.php @@ -10,23 +10,20 @@ // through this entry point or not. define( 'MW_PHPUNIT_TEST', true ); -$wgPhpUnitClass = 'PHPUnit_TextUI_Command'; - // Start up MediaWiki in command-line mode require_once dirname( dirname( __DIR__ ) ) . "/maintenance/Maintenance.php"; class PHPUnitMaintClass extends Maintenance { public static $additionalOptions = [ - 'regex' => false, 'file' => false, 'use-filebackend' => false, 'use-bagostuff' => false, 'use-jobqueue' => false, - 'keep-uploads' => false, 'use-normal-tables' => false, 'reuse-db' => false, 'wiki' => false, + 'profiler' => false, ]; public function __construct() { @@ -43,22 +40,10 @@ class PHPUnitMaintClass extends Maintenance { false, # not required false # no arg needed ); - $this->addOption( - 'regex', - 'Only run parser tests that match the given regex.', - false, - true - ); $this->addOption( 'file', 'File describing parser tests.', false, true ); $this->addOption( 'use-filebackend', 'Use filebackend', false, true ); $this->addOption( 'use-bagostuff', 'Use bagostuff', false, true ); $this->addOption( 'use-jobqueue', 'Use jobqueue', false, true ); - $this->addOption( - 'keep-uploads', - 'Re-use the same upload directory for each test, don\'t delete it.', - false, - false - ); $this->addOption( 'use-normal-tables', 'Use normal DB tables.', false, false ); $this->addOption( 'reuse-db', 'Init DB only if tables are missing and keep after finish.', @@ -70,104 +55,10 @@ class PHPUnitMaintClass extends Maintenance { public function finalSetup() { parent::finalSetup(); - global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType, $wgMainWANCache; - global $wgMainStash; - global $wgLanguageConverterCacheType, $wgUseDatabaseMessages; - global $wgLocaltimezone, $wgLocalisationCacheConf; - global $wgDevelopmentWarnings; - global $wgSessionProviders, $wgSessionPbkdf2Iterations; - global $wgJobTypeConf; - global $wgAuthManagerConfig, $wgAuth; - // Inject test autoloader - require_once __DIR__ . '/../TestsAutoLoader.php'; - - // wfWarn should cause tests to fail - $wgDevelopmentWarnings = true; - - // Make sure all caches and stashes are either disabled or use - // in-process cache only to prevent tests from using any preconfigured - // cache meant for the local wiki from outside the test run. - // See also MediaWikiTestCase::run() which mocks CACHE_DB and APC. - - // Disabled in DefaultSettings, override local settings - $wgMainWANCache = - $wgMainCacheType = CACHE_NONE; - // Uses CACHE_ANYTHING in DefaultSettings, use hash instead of db - $wgMessageCacheType = - $wgParserCacheType = - $wgSessionCacheType = - $wgLanguageConverterCacheType = 'hash'; - // Uses db-replicated in DefaultSettings - $wgMainStash = 'hash'; - // Use memory job queue - $wgJobTypeConf = [ - 'default' => [ 'class' => 'JobQueueMemory', 'order' => 'fifo' ], - ]; - - $wgUseDatabaseMessages = false; # Set for future resets - - // Assume UTC for testing purposes - $wgLocaltimezone = 'UTC'; - - $wgLocalisationCacheConf['storeClass'] = 'LCStoreNull'; - - // Generic MediaWiki\Session\SessionManager configuration for tests - // We use CookieSessionProvider because things might be expecting - // cookies to show up in a FauxRequest somewhere. - $wgSessionProviders = [ - [ - 'class' => MediaWiki\Session\CookieSessionProvider::class, - 'args' => [ [ - 'priority' => 30, - 'callUserSetCookiesHook' => true, - ] ], - ], - ]; - - // Single-iteration PBKDF2 session secret derivation, for speed. - $wgSessionPbkdf2Iterations = 1; + self::requireTestsAutoloader(); - // Generic AuthManager configuration for testing - $wgAuthManagerConfig = [ - 'preauth' => [], - 'primaryauth' => [ - [ - 'class' => MediaWiki\Auth\TemporaryPasswordPrimaryAuthenticationProvider::class, - 'args' => [ [ - 'authoritative' => false, - ] ], - ], - [ - 'class' => MediaWiki\Auth\LocalPasswordPrimaryAuthenticationProvider::class, - 'args' => [ [ - 'authoritative' => true, - ] ], - ], - ], - 'secondaryauth' => [], - ]; - $wgAuth = new MediaWiki\Auth\AuthManagerAuthPlugin(); - - // Bug 44192 Do not attempt to send a real e-mail - Hooks::clear( 'AlternateUserMailer' ); - Hooks::register( - 'AlternateUserMailer', - function () { - return false; - } - ); - // xdebug's default of 100 is too low for MediaWiki - ini_set( 'xdebug.max_nesting_level', 1000 ); - - // Bug T116683 serialize_precision of 100 - // may break testing against floating point values - // treated with PHP's serialize() - ini_set( 'serialize_precision', 17 ); - - // TODO: we should call MediaWikiTestCase::prepareServices( new GlobalVarConfig() ) here. - // But PHPUnit may not be loaded yet, so we have to wait until just - // before PHPUnit_TextUI_Command::main() is executed at the end of this file. + TestSetup::applyInitialConfig(); } public function execute() { @@ -188,9 +79,10 @@ class PHPUnitMaintClass extends Maintenance { [ '--configuration', $IP . '/tests/phpunit/suite.xml' ] ); } + $phpUnitClass = 'PHPUnit_TextUI_Command'; + if ( $this->hasOption( 'with-phpunitclass' ) ) { - global $wgPhpUnitClass; - $wgPhpUnitClass = $this->getOption( 'with-phpunitclass' ); + $phpUnitClass = $this->getOption( 'with-phpunitclass' ); # Cleanup $args array so the option and its value do not # pollute PHPUnit @@ -220,6 +112,25 @@ class PHPUnitMaintClass extends Maintenance { } } + if ( !class_exists( 'PHPUnit_Framework_TestCase' ) ) { + echo "PHPUnit not found. Please install it and other dev dependencies by + running `composer install` in MediaWiki root directory.\n"; + exit( 1 ); + } + if ( !class_exists( $phpUnitClass ) ) { + echo "PHPUnit entry point '" . $phpUnitClass . "' not found. Please make sure you installed + the containing component and check the spelling of the class name.\n"; + exit( 1 ); + } + + echo defined( 'HHVM_VERSION' ) ? + 'Using HHVM ' . HHVM_VERSION . ' (' . PHP_VERSION . ")\n" : + 'Using PHP ' . PHP_VERSION . "\n"; + + // Prepare global services for unit tests. + MediaWikiTestCase::prepareServices( new GlobalVarConfig() ); + + $phpUnitClass::main(); } public function getDbType() { @@ -250,25 +161,3 @@ class PHPUnitMaintClass extends Maintenance { $maintClass = 'PHPUnitMaintClass'; require RUN_MAINTENANCE_IF_MAIN; - -if ( !class_exists( 'PHPUnit_Framework_TestCase' ) ) { - echo "PHPUnit not found. Please install it and other dev dependencies by -running `composer install` in MediaWiki root directory.\n"; - exit( 1 ); -} -if ( !class_exists( $wgPhpUnitClass ) ) { - echo "PHPUnit entry point '" . $wgPhpUnitClass . "' not found. Please make sure you installed -the containing component and check the spelling of the class name.\n"; - exit( 1 ); -} - -echo defined( 'HHVM_VERSION' ) ? - 'Using HHVM ' . HHVM_VERSION . ' (' . PHP_VERSION . ")\n" : - 'Using PHP ' . PHP_VERSION . "\n"; - -// Prepare global services for unit tests. -// FIXME: this should be done in the finalSetup() method, -// but PHPUnit may not have been loaded at that point. -MediaWikiTestCase::prepareServices( new GlobalVarConfig() ); - -$wgPhpUnitClass::main(); diff --git a/tests/phpunit/structure/ApiDocumentationTest.php b/tests/phpunit/structure/ApiDocumentationTest.php index 2049e38ba0..bc5a6bd6c7 100644 --- a/tests/phpunit/structure/ApiDocumentationTest.php +++ b/tests/phpunit/structure/ApiDocumentationTest.php @@ -137,6 +137,8 @@ class ApiDocumentationTest extends MediaWikiTestCase { // Messages for examples. foreach ( $module->getExamplesMessages() as $qs => $msg ) { + $this->assertStringStartsNotWith( 'api.php?', $qs, + "Query string must not begin with 'api.php?'" ); $this->checkMessage( $msg, "Example $qs" ); } } diff --git a/tests/phpunit/structure/ContentHandlerSanityTest.php b/tests/phpunit/structure/ContentHandlerSanityTest.php new file mode 100644 index 0000000000..98a0fbbfd5 --- /dev/null +++ b/tests/phpunit/structure/ContentHandlerSanityTest.php @@ -0,0 +1,53 @@ +makeEmptyContent(); + $this->assertInstanceOf( Content::class, $content ); + if ( $handler instanceof TextContentHandler ) { + // TextContentHandler::getContentClass() is protected, so bypass + // that restriction + $testingWrapper = TestingAccessWrapper::newFromObject( $handler ); + $this->assertInstanceOf( $testingWrapper->getContentClass(), $content ); + } + + $handlerClass = get_class( $handler ); + $contentClass = get_class( $content ); + + $this->assertTrue( + $content->isValid(), + "$handlerClass::makeEmptyContent() did not return a valid content ($contentClass::isValid())" + ); + } +} diff --git a/tests/phpunit/structure/ExtensionJsonValidationTest.php b/tests/phpunit/structure/ExtensionJsonValidationTest.php index 711eab647e..e11fd8a548 100644 --- a/tests/phpunit/structure/ExtensionJsonValidationTest.php +++ b/tests/phpunit/structure/ExtensionJsonValidationTest.php @@ -16,6 +16,9 @@ * http://www.gnu.org/copyleft/gpl.html */ +use Composer\Spdx\SpdxLicenses; +use JsonSchema\Validator; + /** * Validates all loaded extensions and skins using the ExtensionRegistry * against the extension.json schema in the docs/ folder. @@ -24,7 +27,7 @@ class ExtensionJsonValidationTest extends PHPUnit_Framework_TestCase { public function setUp() { parent::setUp(); - if ( !class_exists( 'JsonSchema\Uri\UriRetriever' ) ) { + if ( !class_exists( Validator::class ) ) { $this->markTestSkipped( 'The JsonSchema library cannot be found,' . ' please install it through composer to run extension.json validation tests.' @@ -75,9 +78,22 @@ class ExtensionJsonValidationTest extends PHPUnit_Framework_TestCase { "$path is using a non-supported schema version" ); - $validator = new JsonSchema\Validator; - $validator->check( $data, (object) [ '$ref' => 'file://' . $schemaPath ] ); - if ( $validator->isValid() ) { + $licenseError = false; + if ( class_exists( SpdxLicenses::class ) && isset( $data->{'license-name'} ) + // Check if it's a string, if not, schema validation will display an error + && is_string( $data->{'license-name'} ) + ) { + $licenses = new SpdxLicenses(); + $valid = $licenses->validate( $data->{'license-name'} ); + if ( !$valid ) { + $licenseError = '[license-name] Invalid SPDX license identifier, ' + . 'see '; + } + } + + $validator = new Validator; + $validator->check( $data, (object)[ '$ref' => 'file://' . $schemaPath ] ); + if ( $validator->isValid() && !$licenseError ) { // All good. $this->assertTrue( true ); } else { @@ -85,6 +101,9 @@ class ExtensionJsonValidationTest extends PHPUnit_Framework_TestCase { foreach ( $validator->getErrors() as $error ) { $out .= "[{$error['property']}] {$error['message']}\n"; } + if ( $licenseError ) { + $out .= "$licenseError\n"; + } $this->assertTrue( false, $out ); } } diff --git a/tests/phpunit/structure/ResourcesTest.php b/tests/phpunit/structure/ResourcesTest.php index 86ce53f339..2e6bf37db8 100644 --- a/tests/phpunit/structure/ResourcesTest.php +++ b/tests/phpunit/structure/ResourcesTest.php @@ -91,7 +91,6 @@ class ResourcesTest extends MediaWikiTestCase { */ public function testMissingMessages() { $data = self::getAllModules(); - $validDeps = array_keys( $data['modules'] ); $lang = Language::factory( 'en' ); /** @var ResourceLoaderModule $module */ @@ -114,7 +113,6 @@ class ResourcesTest extends MediaWikiTestCase { */ public function testUnsatisfiableDependencies() { $data = self::getAllModules(); - $validDeps = array_keys( $data['modules'] ); /** @var ResourceLoaderModule $module */ foreach ( $data['modules'] as $moduleName => $module ) { diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml index ed18205753..11a25c4105 100644 --- a/tests/phpunit/suite.xml +++ b/tests/phpunit/suite.xml @@ -20,12 +20,14 @@ includes + + includes/parser/ParserIntegrationTest.php languages - includes/parser/MediaWikiParserTest.php + suites/CoreParserTestSuite.php suites/ExtensionsParserTestSuite.php @@ -41,6 +43,9 @@ structure + + tests + suites/UploadFromUrlTestSuite.php @@ -55,7 +60,6 @@ Utility Broken - ParserFuzz Stub diff --git a/tests/phpunit/suites/CoreParserTestSuite.php b/tests/phpunit/suites/CoreParserTestSuite.php new file mode 100644 index 0000000000..e48a116547 --- /dev/null +++ b/tests/phpunit/suites/CoreParserTestSuite.php @@ -0,0 +1,10 @@ +ptRunner = $runner; + $this->ptFileName = $fileName; + $this->ptFileInfo = TestFileReader::read( $this->ptFileName ); + + foreach ( $this->ptFileInfo['tests'] as $test ) { + $this->addTest( new ParserIntegrationTest( $runner, $fileName, $test ), + [ 'Database', 'Parser', 'ParserTests' ] ); + } + } + + function setUp() { + $this->ptRunner->addArticles( $this->ptFileInfo[ 'articles'] ); + } +} diff --git a/tests/phpunit/suites/ParserTestTopLevelSuite.php b/tests/phpunit/suites/ParserTestTopLevelSuite.php new file mode 100644 index 0000000000..5d5d693571 --- /dev/null +++ b/tests/phpunit/suites/ParserTestTopLevelSuite.php @@ -0,0 +1,158 @@ +ptRecorder = new PhpunitTestRecorder; + $this->ptRunner = new ParserTestRunner( $this->ptRecorder ); + + if ( is_string( $flags ) ) { + $flags = self::CORE_ONLY; + } + global $wgParserTestFiles, $IP; + + $mwTestDir = $IP . '/tests/'; + + # Human friendly helpers + $wantsCore = ( $flags & self::CORE_ONLY ); + $wantsRest = ( $flags & self::NO_CORE ); + + # Will hold the .txt parser test files we will include + $filesToTest = []; + + # Filter out .txt files + foreach ( $wgParserTestFiles as $parserTestFile ) { + $isCore = ( 0 === strpos( $parserTestFile, $mwTestDir ) ); + + if ( $isCore && $wantsCore ) { + self::debug( "included core parser tests: $parserTestFile" ); + $filesToTest[] = $parserTestFile; + } elseif ( !$isCore && $wantsRest ) { + self::debug( "included non core parser tests: $parserTestFile" ); + $filesToTest[] = $parserTestFile; + } else { + self::debug( "skipped parser tests: $parserTestFile" ); + } + } + self::debug( 'parser tests files: ' + . implode( ' ', $filesToTest ) ); + + $testList = []; + $counter = 0; + foreach ( $filesToTest as $fileName ) { + // Call the highest level directory the extension name. + // It may or may not actually be, but it should be close + // enough to cause there to be separate names for different + // things, which is good enough for our purposes. + $extensionName = basename( dirname( $fileName ) ); + $testsName = $extensionName . '__' . basename( $fileName, '.txt' ); + $parserTestClassName = ucfirst( $testsName ); + + // Official spec for class names: https://secure.php.net/manual/en/language.oop5.basic.php + // Prepend 'ParserTest_' to be paranoid about it not starting with a number + $parserTestClassName = 'ParserTest_' . + preg_replace( '/[^a-zA-Z0-9_\x7f-\xff]/', '_', $parserTestClassName ); + + if ( isset( $testList[$parserTestClassName] ) ) { + // If there is a conflict, append a number. + $counter++; + $parserTestClassName .= $counter; + } + $testList[$parserTestClassName] = true; + + // Previously we actually created a class here, with eval(). We now + // just override the name. + + self::debug( "Adding test class $parserTestClassName" ); + $this->addTest( new ParserTestFileSuite( + $this->ptRunner, $parserTestClassName, $fileName ) ); + } + } + + public function setUp() { + wfDebug( __METHOD__ ); + $db = wfGetDB( DB_MASTER ); + $type = $db->getType(); + $prefix = $type === 'oracle' ? + MediaWikiTestCase::ORA_DB_PREFIX : MediaWikiTestCase::DB_PREFIX; + MediaWikiTestCase::setupTestDB( $db, $prefix ); + $teardown = $this->ptRunner->setDatabase( $db ); + $teardown = $this->ptRunner->setupUploads( $teardown ); + $this->ptTeardownScope = $teardown; + } + + public function tearDown() { + wfDebug( __METHOD__ ); + if ( $this->ptTeardownScope ) { + ScopedCallback::consume( $this->ptTeardownScope ); + } + } + + /** + * Write $msg under log group 'tests-parser' + * @param string $msg Message to log + */ + protected static function debug( $msg ) { + return wfDebugLog( 'tests-parser', wfGetCaller() . ' ' . $msg ); + } +} diff --git a/tests/phpunit/tests/MediaWikiTestCaseTest.php b/tests/phpunit/tests/MediaWikiTestCaseTest.php index 5d2f37e6a6..edc81ff925 100644 --- a/tests/phpunit/tests/MediaWikiTestCaseTest.php +++ b/tests/phpunit/tests/MediaWikiTestCaseTest.php @@ -9,8 +9,6 @@ use Psr\Log\LoggerInterface; */ class MediaWikiTestCaseTest extends MediaWikiTestCase { - const GLOBAL_KEY_NONEXISTING = 'MediaWikiTestCaseTestGLOBAL-NONExisting'; - private static $startGlobals = [ 'MediaWikiTestCaseTestGLOBAL-ExistingString' => 'foo', 'MediaWikiTestCaseTestGLOBAL-ExistingStringEmpty' => '', @@ -90,14 +88,22 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase { /** * @covers MediaWikiTestCase::stashMwGlobals + * @covers MediaWikiTestCase::tearDown */ - public function testExceptionThrownWhenStashingNonExistentGlobals() { - $this->setExpectedException( - 'Exception', - 'Global with key ' . self::GLOBAL_KEY_NONEXISTING . ' doesn\'t exist and cant be stashed' + public function testSetNonExistentGlobalsAreUnsetOnTearDown() { + $globalKey = 'abcdefg1234567'; + $this->setMwGlobals( $globalKey, true ); + $this->assertTrue( + $GLOBALS[$globalKey], + 'Global failed to correctly set' ); - $this->stashMwGlobals( self::GLOBAL_KEY_NONEXISTING ); + $this->tearDown(); + + $this->assertFalse( + isset( $GLOBALS[$globalKey] ), + 'Global failed to be correctly unset' + ); } public function testOverrideMwServices() { @@ -132,10 +138,9 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase { /** * @covers MediaWikiTestCase::setLogger - * @covers MediaWikiTestCase::restoreLogger + * @covers MediaWikiTestCase::restoreLoggers */ - public function testLoggersAreRestoredOnTearDown() { - // replacing an existing logger + public function testLoggersAreRestoredOnTearDown_replacingExistingLogger() { $logger1 = LoggerFactory::getInstance( 'foo' ); $this->setLogger( 'foo', $this->getMock( LoggerInterface::class ) ); $logger2 = LoggerFactory::getInstance( 'foo' ); @@ -144,17 +149,27 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase { $this->assertSame( $logger1, $logger3 ); $this->assertNotSame( $logger1, $logger2 ); + } - // replacing a non-existing logger + /** + * @covers MediaWikiTestCase::setLogger + * @covers MediaWikiTestCase::restoreLoggers + */ + public function testLoggersAreRestoredOnTearDown_replacingNonExistingLogger() { $this->setLogger( 'foo', $this->getMock( LoggerInterface::class ) ); - $logger1 = LoggerFactory::getInstance( 'bar' ); + $logger1 = LoggerFactory::getInstance( 'foo' ); $this->tearDown(); - $logger2 = LoggerFactory::getInstance( 'bar' ); + $logger2 = LoggerFactory::getInstance( 'foo' ); $this->assertNotSame( $logger1, $logger2 ); $this->assertInstanceOf( '\Psr\Log\LoggerInterface', $logger2 ); + } - // replacing same logger twice + /** + * @covers MediaWikiTestCase::setLogger + * @covers MediaWikiTestCase::restoreLoggers + */ + public function testLoggersAreRestoredOnTearDown_replacingSameLoggerTwice() { $logger1 = LoggerFactory::getInstance( 'baz' ); $this->setLogger( 'foo', $this->getMock( LoggerInterface::class ) ); $this->setLogger( 'foo', $this->getMock( LoggerInterface::class ) ); diff --git a/tests/qunit/data/defineCallMwLoaderTestCallback.js b/tests/qunit/data/defineCallMwLoaderTestCallback.js index afd886c334..641071a220 100644 --- a/tests/qunit/data/defineCallMwLoaderTestCallback.js +++ b/tests/qunit/data/defineCallMwLoaderTestCallback.js @@ -1 +1 @@ -module.exports = 'Define worked.'; +module.exports = 'Defined.'; diff --git a/tests/qunit/data/requireCallMwLoaderTestCallback.js b/tests/qunit/data/requireCallMwLoaderTestCallback.js index 8bc087b007..815a3b4868 100644 --- a/tests/qunit/data/requireCallMwLoaderTestCallback.js +++ b/tests/qunit/data/requireCallMwLoaderTestCallback.js @@ -1,2 +1,6 @@ -var x = require( 'test.require.define' ); -module.exports = 'Require worked.' + x; +module.exports = { + immediate: require( 'test.require.define' ), + later: function () { + return require( 'test.require.define' ); + } +}; diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js index 79f37dca44..0b28684a59 100644 --- a/tests/qunit/data/testrunner.js +++ b/tests/qunit/data/testrunner.js @@ -25,6 +25,9 @@ // killing the test and assuming timeout failure. QUnit.config.testTimeout = 60 * 1000; + // Reduce default animation duration from 400ms to 0ms for unit tests + $.fx.speeds._default = 0; + // Add a checkbox to QUnit header to toggle MediaWiki ResourceLoader debug mode. QUnit.config.urlConfig.push( { id: 'debug', @@ -167,10 +170,11 @@ */ QUnit.newMwEnvironment = ( function () { var warn, error, liveConfig, liveMessages, + MwMap = mw.config.constructor, // internal use only ajaxRequests = []; - liveConfig = mw.config.values; - liveMessages = mw.messages.values; + liveConfig = mw.config; + liveMessages = mw.messages; function suppressWarnings() { warn = mw.log.warn; @@ -198,14 +202,14 @@ // NOTE: It is important that we suppress warnings because extend() will also access // deprecated properties and trigger deprecation warnings from mw.log#deprecate. suppressWarnings(); - copy = $.extend( {}, liveConfig, custom ); + copy = $.extend( {}, liveConfig.get(), custom ); restoreWarnings(); return copy; } function freshMessagesCopy( custom ) { - return $.extend( /*deep=*/true, {}, liveMessages, custom ); + return $.extend( /*deep=*/true, {}, liveMessages.get(), custom ); } /** @@ -231,8 +235,15 @@ setup: function () { // Greetings, mock environment! - mw.config.values = freshConfigCopy( localEnv.config ); - mw.messages.values = freshMessagesCopy( localEnv.messages ); + mw.config = new MwMap(); + mw.config.set( freshConfigCopy( localEnv.config ) ); + mw.messages = new MwMap(); + mw.messages.set( freshMessagesCopy( localEnv.messages ) ); + // Update reference to mw.messages + mw.jqueryMsg.setParserDefaults( { + messages: mw.messages + } ); + this.suppressWarnings = suppressWarnings; this.restoreWarnings = restoreWarnings; @@ -251,8 +262,12 @@ $( document ).off( 'ajaxSend', trackAjax ); // Farewell, mock environment! - mw.config.values = liveConfig; - mw.messages.values = liveMessages; + mw.config = liveConfig; + mw.messages = liveMessages; + // Restore reference to mw.messages + mw.jqueryMsg.setParserDefaults( { + messages: liveMessages + } ); // As a convenience feature, automatically restore warnings if they're // still suppressed by the end of the test. diff --git a/tests/qunit/suites/resources/jquery/jquery.color.test.js b/tests/qunit/suites/resources/jquery/jquery.color.test.js index 9afd793e5b..ca6a512fc5 100644 --- a/tests/qunit/suites/resources/jquery/jquery.color.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.color.test.js @@ -1,18 +1,15 @@ ( function ( $ ) { - QUnit.module( 'jquery.color', QUnit.newMwEnvironment( { - setup: function () { - this.clock = this.sandbox.useFakeTimers(); - } - } ) ); + QUnit.module( 'jquery.color', QUnit.newMwEnvironment() ); - QUnit.test( 'animate', 1, function ( assert ) { - var $canvas = $( '' ).css( 'background-color', '#fff' ); + QUnit.test( 'animate', function ( assert ) { + var done = assert.async(), + $canvas = $( '' ).css( 'background-color', '#fff' ).appendTo( '#qunit-fixture' ); - $canvas.animate( { backgroundColor: '#000' }, 10 ).promise().then( function () { - var endColors = $.colorUtil.getRGB( $canvas.css( 'background-color' ) ); - assert.deepEqual( endColors, [ 0, 0, 0 ], 'end state' ); - } ); - - this.clock.tick( 20 ); + $canvas.animate( { 'background-color': '#000' }, 3 ).promise() + .done( function () { + var endColors = $.colorUtil.getRGB( $canvas.css( 'background-color' ) ); + assert.deepEqual( endColors, [ 0, 0, 0 ], 'end state' ); + } ) + .always( done ); } ); }( jQuery ) ); diff --git a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js index c51e40931c..9c7660fe8d 100644 --- a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js @@ -1,11 +1,7 @@ ( function ( mw, $ ) { var loremIpsum = 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit.'; - QUnit.module( 'jquery.makeCollapsible', QUnit.newMwEnvironment( { - setup: function () { - this.clock = this.sandbox.useFakeTimers(); - } - } ) ); + QUnit.module( 'jquery.makeCollapsible', QUnit.newMwEnvironment() ); function prepareCollapsible( html, options ) { return $( $.parseHTML( html ) ) @@ -42,12 +38,10 @@ // ...expanding happens here $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } ); // ...collapsing happens here $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } ); QUnit.test( 'basic operation ()', 5, function ( assert ) { @@ -71,11 +65,9 @@ } ); $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } ); $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } ); QUnit.test( 'basic operation ()', 7, function ( assert ) { @@ -106,11 +98,9 @@ } ); $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } ); $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } ); function tableWithCaptionTest( $collapsible, test, assert ) { @@ -137,11 +127,9 @@ } ); $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } ); $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } QUnit.test( 'basic operation ( with caption)', 10, function ( assert ) { @@ -192,11 +180,9 @@ } ); $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } ); $toggle.trigger( 'click' ); - test.clock.tick( 500 ); } QUnit.test( 'basic operation ()', 7, function ( assert ) { @@ -260,7 +246,6 @@ } ); $collapsible.find( '.mw-collapsible-toggle' ).trigger( 'click' ); - this.clock.tick( 500 ); } ); QUnit.test( 'initial collapse (options.collapsed)', 2, function ( assert ) { @@ -278,7 +263,6 @@ } ); $collapsible.find( '.mw-collapsible-toggle' ).trigger( 'click' ); - this.clock.tick( 500 ); } ); QUnit.test( 'clicks on links inside toggler pass through (options.linksPassthru)', 2, function ( assert ) { @@ -316,7 +300,6 @@ } ); $collapsible.find( '.mw-collapsible-toggle' ).trigger( 'click' ); - this.clock.tick( 500 ); } ); QUnit.test( 'collapse/expand text (options.collapseText, options.expandText)', 2, function ( assert ) { @@ -333,7 +316,6 @@ } ); $collapsible.find( '.mw-collapsible-toggle' ).trigger( 'click' ); - this.clock.tick( 500 ); } ); QUnit.test( 'cloned collapsibles can be made collapsible again', 2, function ( assert ) { @@ -352,6 +334,5 @@ } ); $clone.find( '.mw-collapsible-toggle a' ).trigger( 'click' ); - test.clock.tick( 500 ); } ); }( mediaWiki, jQuery ) ); diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js index a48067125f..0797f32dfb 100644 --- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js +++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js @@ -18,10 +18,10 @@ assert.deepEqual( stub.getCall( 0 ).args, [ { foo: 'bar' } ], '#saveOptions called correctly' ); } ); - QUnit.test( 'saveOptions', function ( assert ) { + QUnit.test( 'saveOptions without Unit Separator', function ( assert ) { QUnit.expect( 13 ); - var api = new mw.Api(); + var api = new mw.Api( { useUS: false } ); // We need to respond to the request for token first, otherwise the other requests won't be sent // until after the server.respond call, which confuses sinon terribly. This sucks a lot. @@ -75,4 +75,66 @@ } } ); } ); + + QUnit.test( 'saveOptions with Unit Separator', function ( assert ) { + QUnit.expect( 14 ); + + var api = new mw.Api( { useUS: true } ); + + // We need to respond to the request for token first, otherwise the other requests won't be sent + // until after the server.respond call, which confuses sinon terribly. This sucks a lot. + api.getToken( 'options' ); + this.server.respond( + /meta=tokens&type=csrf/, + [ 200, { 'Content-Type': 'application/json' }, + '{ "query": { "tokens": { "csrftoken": "+\\\\" } } }' ] + ); + + api.saveOptions( {} ).done( function () { + assert.ok( true, 'Request completed: empty case' ); + } ); + api.saveOptions( { foo: 'bar' } ).done( function () { + assert.ok( true, 'Request completed: simple' ); + } ); + api.saveOptions( { foo: 'bar', baz: 'quux' } ).done( function () { + assert.ok( true, 'Request completed: two options' ); + } ); + api.saveOptions( { foo: 'bar|quux', bar: 'a|b|c', baz: 'quux' } ).done( function () { + assert.ok( true, 'Request completed: bundleable with unit separator' ); + } ); + api.saveOptions( { foo: 'bar|quux', bar: 'a|b|c', 'baz=baz': 'quux' } ).done( function () { + assert.ok( true, 'Request completed: not bundleable with unit separator' ); + } ); + api.saveOptions( { foo: null } ).done( function () { + assert.ok( true, 'Request completed: reset an option' ); + } ); + api.saveOptions( { 'foo|bar=quux': null } ).done( function () { + assert.ok( true, 'Request completed: reset an option, not bundleable' ); + } ); + + // Requests are POST, match requestBody instead of url + this.server.respond( function ( request ) { + switch ( request.requestBody ) { + // simple + case 'action=options&format=json&formatversion=2&change=foo%3Dbar&token=%2B%5C': + // two options + case 'action=options&format=json&formatversion=2&change=foo%3Dbar%7Cbaz%3Dquux&token=%2B%5C': + // bundleable with unit separator + case 'action=options&format=json&formatversion=2&change=%1Ffoo%3Dbar%7Cquux%1Fbar%3Da%7Cb%7Cc%1Fbaz%3Dquux&token=%2B%5C': + // not bundleable with unit separator + case 'action=options&format=json&formatversion=2&optionname=baz%3Dbaz&optionvalue=quux&token=%2B%5C': + case 'action=options&format=json&formatversion=2&change=%1Ffoo%3Dbar%7Cquux%1Fbar%3Da%7Cb%7Cc&token=%2B%5C': + // reset an option + case 'action=options&format=json&formatversion=2&change=foo&token=%2B%5C': + // reset an option, not bundleable + case 'action=options&format=json&formatversion=2&optionname=foo%7Cbar%3Dquux&token=%2B%5C': + assert.ok( true, 'Repond to ' + request.requestBody ); + request.respond( 200, { 'Content-Type': 'application/json' }, + '{ "options": "success" }' ); + break; + default: + assert.ok( false, 'Unexpected request: ' + request.requestBody ); + } + } ); + } ); }( mediaWiki ) ); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js index 991725b8c6..124c49f5b8 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js @@ -1,4 +1,3 @@ -/*jshint -W024 */ ( function ( mw, $ ) { var repeat = function ( input, multiplier ) { return new Array( multiplier + 1 ).join( input ); @@ -38,6 +37,8 @@ 'A < B', 'A > B', 'A | B', + 'A \t B', + 'A \n B', // URL encoding 'A%20B', 'A%23B', @@ -222,7 +223,7 @@ assert.equal( title.getPrefixedText(), '.foo' ); } ); - QUnit.test( 'Transformation', 11, function ( assert ) { + QUnit.test( 'Transformation', 12, function ( assert ) { var title; title = new mw.Title( 'File:quux pif.jpg' ); @@ -242,10 +243,12 @@ assert.equal( title.toText(), 'User:HAshAr' ); assert.equal( title.getNamespaceId(), 2, 'Case-insensitive namespace prefix' ); - // Don't ask why, it's the way the backend works. One space is kept of each set. - title = new mw.Title( 'Foo __ \t __ bar' ); + title = new mw.Title( 'Foo \u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000 bar' ); assert.equal( title.getMain(), 'Foo_bar', 'Merge multiple types of whitespace/underscores into a single underscore' ); + title = new mw.Title( 'Foo\u200E\u200F\u202A\u202B\u202C\u202D\u202Ebar' ); + assert.equal( title.getMain(), 'Foobar', 'Strip Unicode bidi override characters' ); + // Regression test: Previously it would only detect an extension if there is no space after it title = new mw.Title( 'Example.js ' ); assert.equal( title.getExtension(), 'js', 'Space after an extension is stripped' ); @@ -295,7 +298,7 @@ }, 'Throw error on empty string' ); } ); - QUnit.test( 'Case-sensivity', 3, function ( assert ) { + QUnit.test( 'Case-sensivity', 5, function ( assert ) { var title; // Default config @@ -304,6 +307,12 @@ title = new mw.Title( 'article' ); assert.equal( title.toString(), 'Article', 'Default config: No sensitive namespaces by default. First-letter becomes uppercase' ); + title = new mw.Title( 'Ã' ); + assert.equal( title.toString(), 'Ã', 'Uppercasing matches PHP behaviour (Ã -> Ã, not SS)' ); + + title = new mw.Title( 'Ç (digraph)' ); + assert.equal( title.toString(), 'Ç_(digraph)', 'Uppercasing matches PHP behaviour (Ç -> Ç, not Ç)' ); + // $wgCapitalLinks = false; mw.config.set( 'wgCaseSensitiveNamespaces', [ 0, -2, 1, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15 ] ); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js index b12803d6c7..97185fca73 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js @@ -1,4 +1,3 @@ -/*jshint -W024 */ ( function ( mw, $ ) { QUnit.module( 'mediawiki.Uri', QUnit.newMwEnvironment( { setup: function () { diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js index 71330398a0..12181379f0 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js @@ -662,7 +662,7 @@ ); assert.htmlEqual( formatParse( 'external-link-replace', function () {} ), - 'Foo bar', + 'Foo bar', 'External link message processed as function when format is \'parse\'' ); @@ -706,7 +706,7 @@ assert.equal( formatParse( 'uses-missing-int' ), - '[doesnt-exist]', + 'â§¼doesnt-existâ§½', 'int: where nested message does not exist' ); } ); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js index 41d800a0a7..92d13260e9 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js @@ -1,5 +1,12 @@ ( function ( mw, $ ) { - QUnit.module( 'mediawiki (mw.loader)' ); + QUnit.module( 'mediawiki (mw.loader)', QUnit.newMwEnvironment( { + setup: function () { + mw.loader.store.enabled = false; + }, + teardown: function () { + mw.loader.store.enabled = false; + } + } ) ); mw.loader.addSource( 'testloader', @@ -127,6 +134,48 @@ } ); } ); + QUnit.test( '.using() Error: Circular dependency', function ( assert ) { + mw.loader.register( [ + [ 'test.circle1', '0', [ 'test.circle2' ] ], + [ 'test.circle2', '0', [ 'test.circle3' ] ], + [ 'test.circle3', '0', [ 'test.circle1' ] ] + ] ); + mw.loader.using( 'test.circle3' ).then( + function done() { + assert.ok( false, 'Unexpected resolution, expected error.' ); + }, + function fail( e ) { + assert.ok( /Circular/.test( String( e ) ), 'Detect circular dependency' ); + } + ); + } ); + + QUnit.test( '.load() - Error: Circular dependency', function ( assert ) { + mw.loader.register( [ + [ 'test.circleA', '0', [ 'test.circleB' ] ], + [ 'test.circleB', '0', [ 'test.circleC' ] ], + [ 'test.circleC', '0', [ 'test.circleA' ] ] + ] ); + assert.throws( function () { + mw.loader.load( 'test.circleC' ); + }, /Circular/, 'Detect circular dependency' ); + } ); + + QUnit.test( '.using() - Error: Unregistered', function ( assert ) { + mw.loader.using( 'test.using.unreg' ).then( + function done() { + assert.ok( false, 'Unexpected resolution, expected error.' ); + }, + function fail( e ) { + assert.ok( /Unknown/.test( String( e ) ), 'Detect unknown dependency' ); + } + ); + } ); + + QUnit.test( '.load() - Error: Unregistered (ignored)', 0, function ( assert ) { + mw.loader.load( 'test.using.unreg2' ); + } ); + QUnit.test( '.implement( styles={ "css": [text, ..] } )', 2, function ( assert ) { var $element = $( '' ).appendTo( '#qunit-fixture' ); @@ -413,17 +462,6 @@ assert.strictEqual( mw.track.callCount, 1 ); } ); - QUnit.test( 'Circular dependency', 1, function ( assert ) { - mw.loader.register( [ - [ 'test.circle1', '0', [ 'test.circle2' ] ], - [ 'test.circle2', '0', [ 'test.circle3' ] ], - [ 'test.circle3', '0', [ 'test.circle1' ] ] - ] ); - assert.throws( function () { - mw.loader.using( 'test.circle3' ); - }, /Circular/, 'Detect circular dependency' ); - } ); - QUnit.test( 'Out-of-order implementation', 9, function ( assert ) { mw.loader.register( [ [ 'test.module4', '0' ], @@ -594,6 +632,25 @@ mw.loader.load( target ); } ); + QUnit.test( 'Empty string module name - T28804', function ( assert ) { + var done = false; + + assert.strictEqual( mw.loader.getState( '' ), null, 'State (unregistered)' ); + + mw.loader.register( '', 'v1' ); + assert.strictEqual( mw.loader.getState( '' ), 'registered', 'State (registered)' ); + assert.strictEqual( mw.loader.getVersion( '' ), 'v1', 'Version' ); + + mw.loader.implement( '', function () { + done = true; + } ); + + return mw.loader.using( '', function () { + assert.strictEqual( done, true, 'script ran' ); + assert.strictEqual( mw.loader.getState( '' ), 'ready', 'State (ready)' ); + } ); + } ); + QUnit.test( 'Executing race - T112232', 2, function ( assert ) { var done = false; @@ -619,6 +676,64 @@ } ); } ); + QUnit.test( 'Stale response caching - T117587', function ( assert ) { + var count = 0; + mw.loader.store.enabled = true; + mw.loader.register( 'test.stale', 'v2' ); + assert.strictEqual( mw.loader.store.get( 'test.stale' ), false, 'Not in store' ); + + mw.loader.implement( 'test.stale@v1', function () { + count++; + } ); + + return mw.loader.using( 'test.stale' ) + .then( function () { + assert.strictEqual( count, 1 ); + // After implementing, registry contains version as implemented by the response. + assert.strictEqual( mw.loader.getVersion( 'test.stale' ), 'v1', 'Override version' ); + assert.strictEqual( mw.loader.getState( 'test.stale' ), 'ready' ); + assert.ok( mw.loader.store.get( 'test.stale' ), 'In store' ); + } ) + .then( function () { + // Reset run time, but keep mw.loader.store + mw.loader.moduleRegistry[ 'test.stale' ].script = undefined; + mw.loader.moduleRegistry[ 'test.stale' ].state = 'registered'; + mw.loader.moduleRegistry[ 'test.stale' ].version = 'v2'; + + // Module was stored correctly as v1 + // On future navigations, it will be ignored until evicted + assert.strictEqual( mw.loader.store.get( 'test.stale' ), false, 'Not in store' ); + } ); + } ); + + QUnit.test( 'Stale response caching - backcompat', function ( assert ) { + var count = 0; + mw.loader.store.enabled = true; + mw.loader.register( 'test.stalebc', 'v2' ); + assert.strictEqual( mw.loader.store.get( 'test.stalebc' ), false, 'Not in store' ); + + mw.loader.implement( 'test.stalebc', function () { + count++; + } ); + + return mw.loader.using( 'test.stalebc' ) + .then( function () { + assert.strictEqual( count, 1 ); + assert.strictEqual( mw.loader.getState( 'test.stalebc' ), 'ready' ); + assert.ok( mw.loader.store.get( 'test.stalebc' ), 'In store' ); + } ) + .then( function () { + // Reset run time, but keep mw.loader.store + mw.loader.moduleRegistry[ 'test.stalebc' ].script = undefined; + mw.loader.moduleRegistry[ 'test.stalebc' ].state = 'registered'; + mw.loader.moduleRegistry[ 'test.stalebc' ].version = 'v2'; + + // Legacy behaviour is storing under the expected version, + // which woudl lead to whitewashing and stale values (T117587). + assert.ok( mw.loader.store.get( 'test.stalebc' ), 'In store' ); + } ); + } ); + QUnit.test( 'require()', 6, function ( assert ) { mw.loader.register( [ [ 'test.require1', '0' ], @@ -664,7 +779,7 @@ } ); } ); - QUnit.test( 'require() in debug mode', 1, function ( assert ) { + QUnit.test( 'require() in debug mode', function ( assert ) { var path = mw.config.get( 'wgScriptPath' ); mw.loader.register( [ [ 'test.require.define', '0' ], @@ -674,9 +789,15 @@ mw.loader.implement( 'test.require.define', [ QUnit.fixurl( path + '/tests/qunit/data/defineCallMwLoaderTestCallback.js' ) ] ); return mw.loader.using( 'test.require.callback' ).then( function ( require ) { - var exported = require( 'test.require.callback' ); - assert.strictEqual( exported, 'Require worked.Define worked.', - 'module.exports worked in debug mode' ); + var cb = require( 'test.require.callback' ); + assert.strictEqual( cb.immediate, 'Defined.', 'module.exports and require work in debug mode' ); + // Must use try-catch because cb.later() will throw if require is undefined, + // which doesn't work well inside Deferred.then() when using jQuery 1.x with QUnit + try { + assert.strictEqual( cb.later(), 'Defined.', 'require works asynchrously in debug mode' ); + } catch ( e ) { + assert.equal( null, String( e ), 'require works asynchrously in debug mode' ); + } }, function () { assert.ok( false, 'Error callback fired while loader.using "test.require.callback" module' ); } ); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.requestIdleCallback.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.requestIdleCallback.test.js index 7a0996496a..df02693bff 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.requestIdleCallback.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.requestIdleCallback.test.js @@ -95,8 +95,9 @@ if ( window.requestIdleCallback ) { QUnit.test( 'native', function ( assert ) { var done = assert.async(); - // Remove polyfill + // Remove polyfill and clock stub mw.requestIdleCallback.restore(); + this.clock.restore(); mw.requestIdleCallback( function () { assert.expect( 0 ); done(); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js index ab463a9720..bac8274fef 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js @@ -1,4 +1,3 @@ -/*jshint -W024 */ ( function ( mw ) { var specialCharactersPageName, // Can't mock SITENAME since jqueryMsg caches it at load @@ -65,10 +64,11 @@ ); } ); - QUnit.test( 'mw.Map', 35, function ( assert ) { + QUnit.test( 'mw.Map', function ( assert ) { var arry, conf, funky, globalConf, nummy, someValues; conf = new mw.Map(); + // Dummy variables funky = function () {}; arry = []; @@ -126,15 +126,15 @@ lorem: 'ipsum' }, 'Map.get returns multiple values correctly as an object' ); - assert.deepEqual( conf, new mw.Map( conf.values ), 'new mw.Map maps over existing values-bearing object' ); - assert.deepEqual( conf.get( [ 'foo', 'notExist' ] ), { foo: 'bar', notExist: null }, 'Map.get return includes keys that were not found as null values' ); // Interacting with globals and accessing the values object + this.suppressWarnings(); assert.strictEqual( conf.get(), conf.values, 'Map.get returns the entire values object by reference (if called without arguments)' ); + this.restoreWarnings(); conf.set( 'globalMapChecker', 'Hi' ); @@ -170,11 +170,7 @@ } } ); - QUnit.test( 'mw.config', 1, function ( assert ) { - assert.ok( mw.config instanceof mw.Map, 'mw.config instance of mw.Map' ); - } ); - - QUnit.test( 'mw.message & mw.messages', 100, function ( assert ) { + QUnit.test( 'mw.message & mw.messages', function ( assert ) { var goodbye, hello; // Convenience method for asserting the same result for multiple formats @@ -189,7 +185,6 @@ } assert.ok( mw.messages, 'messages defined' ); - assert.ok( mw.messages instanceof mw.Map, 'mw.messages instance of mw.Map' ); assert.ok( mw.messages.set( 'hello', 'Hello awesome world' ), 'mw.messages.set: Register' ); hello = mw.message( 'hello' ); @@ -243,9 +238,7 @@ goodbye = mw.message( 'goodbye' ); assert.strictEqual( goodbye.exists(), false, 'Message.exists returns false for nonexistent messages' ); - assertMultipleFormats( [ 'goodbye' ], [ 'plain', 'text' ], '', 'Message.toString returns if key does not exist' ); - // bug 30684 - assertMultipleFormats( [ 'goodbye' ], [ 'parse', 'escaped' ], '<goodbye>', 'Message.toString returns properly escaped <key> if key does not exist' ); + assertMultipleFormats( [ 'good<>bye' ], [ 'plain', 'text', 'parse', 'escaped' ], 'â§¼good<>byeâ§½', 'Message.toString returns â§¼keyâ§½ if key does not exist' ); assert.ok( mw.messages.set( 'plural-test-msg', 'There {{PLURAL:$1|is|are}} $1 {{PLURAL:$1|result|results}}' ), 'mw.messages.set: Register' ); assertMultipleFormats( [ 'plural-test-msg', 6 ], [ 'text', 'parse', 'escaped' ], 'There are 6 results', 'plural get resolved' ); @@ -324,7 +317,7 @@ QUnit.test( 'mw.msg', 14, function ( assert ) { assert.ok( mw.messages.set( 'hello', 'Hello awesome world' ), 'mw.messages.set: Register' ); assert.equal( mw.msg( 'hello' ), 'Hello awesome world', 'Gets message with default options (existing message)' ); - assert.equal( mw.msg( 'goodbye' ), '', 'Gets message with default options (nonexistent message)' ); + assert.equal( mw.msg( 'goodbye' ), 'â§¼goodbyeâ§½', 'Gets message with default options (nonexistent message)' ); assert.ok( mw.messages.set( 'plural-item', 'Found $1 {{PLURAL:$1|item|items}}' ), 'mw.messages.set: Register' ); assert.equal( mw.msg( 'plural-item', 5 ), 'Found 5 items', 'Apply plural for count 5' ); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js index 3332c08dc0..7f6efa0c77 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js @@ -15,32 +15,32 @@ } } ) ); - QUnit.test( 'options', 1, function ( assert ) { + QUnit.test( 'options', function ( assert ) { assert.ok( mw.user.options instanceof mw.Map, 'options instance of mw.Map' ); } ); - QUnit.test( 'user status', 7, function ( assert ) { - + QUnit.test( 'getters (anonymous)', function ( assert ) { // Forge an anonymous user mw.config.set( 'wgUserName', null ); - delete mw.config.values.wgUserId; + mw.config.set( 'wgUserId', null ); - assert.strictEqual( mw.user.getName(), null, 'user.getName() returns null when anonymous' ); - assert.assertTrue( mw.user.isAnon(), 'user.isAnon() returns true when anonymous' ); - assert.strictEqual( mw.user.getId(), 0, 'user.getId() returns 0 when anonymous' ); + assert.strictEqual( mw.user.getName(), null, 'getName()' ); + assert.strictEqual( mw.user.isAnon(), true, 'isAnon()' ); + assert.strictEqual( mw.user.getId(), 0, 'getId()' ); + } ); - // Not part of startUp module + QUnit.test( 'getters (logged-in)', function ( assert ) { mw.config.set( 'wgUserName', 'John' ); mw.config.set( 'wgUserId', 123 ); - assert.equal( mw.user.getName(), 'John', 'user.getName() returns username when logged-in' ); - assert.assertFalse( mw.user.isAnon(), 'user.isAnon() returns false when logged-in' ); - assert.strictEqual( mw.user.getId(), 123, 'user.getId() returns correct ID when logged-in' ); + assert.equal( mw.user.getName(), 'John', 'getName()' ); + assert.strictEqual( mw.user.isAnon(), false, 'isAnon()' ); + assert.strictEqual( mw.user.getId(), 123, 'getId()' ); - assert.equal( mw.user.id(), 'John', 'user.id Returns username when logged-in' ); + assert.equal( mw.user.id(), 'John', 'user.id()' ); } ); - QUnit.test( 'getUserInfos', 3, function ( assert ) { + QUnit.test( 'getUserInfo', function ( assert ) { mw.config.set( 'wgUserGroups', [ '*', 'user' ] ); mw.user.getGroups( function ( groups ) { @@ -64,7 +64,7 @@ this.server.respond(); } ); - QUnit.test( 'generateRandomSessionId', 4, function ( assert ) { + QUnit.test( 'generateRandomSessionId', function ( assert ) { var result, result2; result = mw.user.generateRandomSessionId(); @@ -77,7 +77,7 @@ } ); - QUnit.test( 'generateRandomSessionId (fallback)', 4, function ( assert ) { + QUnit.test( 'generateRandomSessionId (fallback)', function ( assert ) { var result, result2; // Pretend crypto API is not there to test the Math.random fallback diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js index d697507af6..6dd17f11e1 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js @@ -136,7 +136,7 @@ } ); } ); - QUnit.test( 'getUrl', 13, function ( assert ) { + QUnit.test( 'getUrl', 14, function ( assert ) { var href; mw.config.set( { wgScript: '/w/index.php', @@ -150,6 +150,10 @@ href = mw.util.getUrl( 'Foo:Sandbox? 5+5=10! (test)/sub ' ); assert.equal( href, '/wiki/Foo:Sandbox%3F_5%2B5%3D10!_(test)/sub_', 'complex title' ); + // T149767 + href = mw.util.getUrl( 'My$$test$$$$$title' ); + assert.equal( href, '/wiki/My$$test$$$$$title', 'title with multiple consecutive dollar signs' ); + href = mw.util.getUrl(); assert.equal( href, '/wiki/Foobar', 'default title' ); @@ -237,20 +241,6 @@ assert.strictEqual( mw.util.getParamValue( 'TEST', url ), 'a b+c d', 'Bug 30441: getParamValue must understand "+" encoding of space (multiple spaces)' ); } ); - QUnit.test( 'tooltipAccessKey', 4, function ( assert ) { - this.suppressWarnings(); - - assert.equal( typeof mw.util.tooltipAccessKeyPrefix, 'string', 'tooltipAccessKeyPrefix must be a string' ); - assert.equal( $.type( mw.util.tooltipAccessKeyRegexp ), 'regexp', 'tooltipAccessKeyRegexp is a regexp' ); - assert.ok( mw.util.updateTooltipAccessKeys, 'updateTooltipAccessKeys is non-empty' ); - - 'Example [a]'.replace( mw.util.tooltipAccessKeyRegexp, function ( sub, m1, m2, m3, m4, m5, m6 ) { - assert.equal( m6, 'a', 'tooltipAccessKeyRegexp finds the accesskey hint' ); - } ); - - this.restoreWarnings(); - } ); - QUnit.test( '$content', 2, function ( assert ) { assert.ok( mw.util.$content instanceof jQuery, 'mw.util.$content instance of jQuery' ); assert.strictEqual( mw.util.$content.length, 1, 'mw.util.$content must have length of 1' ); diff --git a/tests/qunit/suites/resources/startup.test.js b/tests/qunit/suites/resources/startup.test.js index 2934b39f3c..045b633695 100644 --- a/tests/qunit/suites/resources/startup.test.js +++ b/tests/qunit/suites/resources/startup.test.js @@ -10,6 +10,7 @@ 'Mozilla/5.0 (Windows NT 6.1.1; rv:5.0) Gecko/20100101 Firefox/5.0', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:9.0) Gecko/20100101 Firefox/9.0', 'Mozilla/5.0 (Macintosh; I; Intel Mac OS X 11_7_9; de-LI; rv:1.9b4) Gecko/2012010317 Firefox/10.0a4', + 'Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20100101 Firefox/10.0', 'Mozilla/5.0 (Windows NT 6.1; rv:12.0) Gecko/20120403211507 Firefox/12.0', 'Mozilla/5.0 (Windows NT 6.2; Win64; x64; rv:16.0.1) Gecko/20121011 Firefox/16.0.1', // Kindle Fire @@ -46,6 +47,8 @@ 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/3B48b Safari/419.3', // Android 'Mozilla/5.0 (Linux; U; Android 2.1; en-us; Nexus One Build/ERD62) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17', + // UC Mini (speed mode off) + 'Mozilla/5.0 (Linux; U; Android 6.0.1; en-US; Nexus_5 Build/MMB29S) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1 UCBrowser/10.7.6.805 Mobile', /* Grade C */ @@ -99,12 +102,18 @@ 'Wget/1.10.1 (Red Hat modified)', // Unknown 'I\'m an unknown browser', + 'I\'m an unknown Glass browser', // Empty '' ], blacklisted: [ /* Grade C */ + // PlayStation + 'Mozilla/5.0 (PLAYSTATION 3; 1.10)', + 'Mozilla/5.0 (PLAYSTATION 3; 3.55)', + 'Mozilla/5.0 (PLAYSTATION 3 4.21) AppleWebKit/531.22.8 (KHTML, like Gecko)', + 'Mozilla/5.0 (PlayStation 4 1.70) AppleWebKit/536.26 (KHTML, like Gecko)', // Open WebOS < 1.5 (Palm Pre, Palm Pixi) 'Mozilla/5.0 (webOS/1.0; U; en-US) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pre/1.0', 'Mozilla/5.0 (webOS/1.4.0; U; en-US) AppleWebKit/532.2 (KHTML, like Gecko) Version/1.0 Safari/532.2 Pixi/1.1 ', @@ -128,7 +137,9 @@ // Google Glass 'Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Glass 1 Build/IMM76L; XE11) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30', // MeeGo - 'Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13' + 'Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13', + // UC Mini (speed mode on) + 'Mozilla/5.0 (X11; U; Linux i686; zh-CN; r:1.2.3.4) Gecko/' ] }; diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc deleted file mode 100644 index 13694063c1..0000000000 --- a/tests/testHelpers.inc +++ /dev/null @@ -1,908 +0,0 @@ -parent = $parent; - $this->term = $parent->term; - } - - function start() { - $this->total = 0; - $this->success = 0; - } - - function record( $test, $subtest, $result ) { - $this->total++; - $this->success += ( $result ? 1 : 0 ); - } - - function end() { - // dummy - } - - function report() { - if ( $this->total > 0 ) { - $this->reportPercentage( $this->success, $this->total ); - } else { - throw new MWException( "No tests found.\n" ); - } - } - - function reportPercentage( $success, $total ) { - $ratio = wfPercent( 100 * $success / $total ); - print $this->term->color( 1 ) . "Passed $success of $total tests ($ratio)... "; - - if ( $success == $total ) { - print $this->term->color( 32 ) . "ALL TESTS PASSED!"; - } else { - $failed = $total - $success; - print $this->term->color( 31 ) . "$failed tests failed!"; - } - - print $this->term->reset() . "\n"; - - return ( $success == $total ); - } -} - -class DbTestPreviewer extends TestRecorder { - protected $lb; // /< Database load balancer - protected $db; // /< Database connection to the main DB - protected $curRun; // /< run ID number for the current run - protected $prevRun; // /< run ID number for the previous run, if any - protected $results; // /< Result array - - /** - * This should be called before the table prefix is changed - * @param TestRecorder $parent - */ - function __construct( $parent ) { - parent::__construct( $parent ); - - $this->lb = wfGetLBFactory()->newMainLB(); - // This connection will have the wiki's table prefix, not parsertest_ - $this->db = $this->lb->getConnection( DB_MASTER ); - } - - /** - * Set up result recording; insert a record for the run with the date - * and all that fun stuff - */ - function start() { - parent::start(); - - if ( !$this->db->tableExists( 'testrun', __METHOD__ ) - || !$this->db->tableExists( 'testitem', __METHOD__ ) - ) { - print "WARNING> `testrun` table not found in database.\n"; - $this->prevRun = false; - } else { - // We'll make comparisons against the previous run later... - $this->prevRun = $this->db->selectField( 'testrun', 'MAX(tr_id)' ); - } - - $this->results = []; - } - - function getName( $test, $subtest ) { - if ( $subtest ) { - return "$test subtest #$subtest"; - } else { - return $test; - } - } - - function record( $test, $subtest, $result ) { - parent::record( $test, $subtest, $result ); - $this->results[ $this->getName( $test, $subtest ) ] = $result; - } - - function report() { - if ( $this->prevRun ) { - // f = fail, p = pass, n = nonexistent - // codes show before then after - $table = [ - 'fp' => 'previously failing test(s) now PASSING! :)', - 'pn' => 'previously PASSING test(s) removed o_O', - 'np' => 'new PASSING test(s) :)', - - 'pf' => 'previously passing test(s) now FAILING! :(', - 'fn' => 'previously FAILING test(s) removed O_o', - 'nf' => 'new FAILING test(s) :(', - 'ff' => 'still FAILING test(s) :(', - ]; - - $prevResults = []; - - $res = $this->db->select( 'testitem', [ 'ti_name', 'ti_success' ], - [ 'ti_run' => $this->prevRun ], __METHOD__ ); - - foreach ( $res as $row ) { - if ( !$this->parent->regex - || preg_match( "/{$this->parent->regex}/i", $row->ti_name ) - ) { - $prevResults[$row->ti_name] = $row->ti_success; - } - } - - $combined = array_keys( $this->results + $prevResults ); - - # Determine breakdown by change type - $breakdown = []; - foreach ( $combined as $test ) { - if ( !isset( $prevResults[$test] ) ) { - $before = 'n'; - } elseif ( $prevResults[$test] == 1 ) { - $before = 'p'; - } else /* if ( $prevResults[$test] == 0 )*/ { - $before = 'f'; - } - - if ( !isset( $this->results[$test] ) ) { - $after = 'n'; - } elseif ( $this->results[$test] == 1 ) { - $after = 'p'; - } else /*if ( $this->results[$test] == 0 ) */ { - $after = 'f'; - } - - $code = $before . $after; - - if ( isset( $table[$code] ) ) { - $breakdown[$code][$test] = $this->getTestStatusInfo( $test, $after ); - } - } - - # Write out results - foreach ( $table as $code => $label ) { - if ( !empty( $breakdown[$code] ) ) { - $count = count( $breakdown[$code] ); - printf( "\n%4d %s\n", $count, $label ); - - foreach ( $breakdown[$code] as $differing_test_name => $statusInfo ) { - print " * $differing_test_name [$statusInfo]\n"; - } - } - } - } else { - print "No previous test runs to compare against.\n"; - } - - print "\n"; - parent::report(); - } - - /** - * Returns a string giving information about when a test last had a status change. - * Could help to track down when regressions were introduced, as distinct from tests - * which have never passed (which are more change requests than regressions). - * @param string $testname - * @param string $after - * @return string - */ - private function getTestStatusInfo( $testname, $after ) { - // If we're looking at a test that has just been removed, then say when it first appeared. - if ( $after == 'n' ) { - $changedRun = $this->db->selectField( 'testitem', - 'MIN(ti_run)', - [ 'ti_name' => $testname ], - __METHOD__ ); - $appear = $this->db->selectRow( 'testrun', - [ 'tr_date', 'tr_mw_version' ], - [ 'tr_id' => $changedRun ], - __METHOD__ ); - - return "First recorded appearance: " - . date( "d-M-Y H:i:s", strtotime( $appear->tr_date ) ) - . ", " . $appear->tr_mw_version; - } - - // Otherwise, this test has previous recorded results. - // See when this test last had a different result to what we're seeing now. - $conds = [ - 'ti_name' => $testname, - 'ti_success' => ( $after == 'f' ? "1" : "0" ) ]; - - if ( $this->curRun ) { - $conds[] = "ti_run != " . $this->db->addQuotes( $this->curRun ); - } - - $changedRun = $this->db->selectField( 'testitem', 'MAX(ti_run)', $conds, __METHOD__ ); - - // If no record of ever having had a different result. - if ( is_null( $changedRun ) ) { - if ( $after == "f" ) { - return "Has never passed"; - } else { - return "Has never failed"; - } - } - - // Otherwise, we're looking at a test whose status has changed. - // (i.e. it used to work, but now doesn't; or used to fail, but is now fixed.) - // In this situation, give as much info as we can as to when it changed status. - $pre = $this->db->selectRow( 'testrun', - [ 'tr_date', 'tr_mw_version' ], - [ 'tr_id' => $changedRun ], - __METHOD__ ); - $post = $this->db->selectRow( 'testrun', - [ 'tr_date', 'tr_mw_version' ], - [ "tr_id > " . $this->db->addQuotes( $changedRun ) ], - __METHOD__, - [ "LIMIT" => 1, "ORDER BY" => 'tr_id' ] - ); - - if ( $post ) { - $postDate = date( "d-M-Y H:i:s", strtotime( $post->tr_date ) ) . ", {$post->tr_mw_version}"; - } else { - $postDate = 'now'; - } - - return ( $after == "f" ? "Introduced" : "Fixed" ) . " between " - . date( "d-M-Y H:i:s", strtotime( $pre->tr_date ) ) . ", " . $pre->tr_mw_version - . " and $postDate"; - } - - /** - * Close the DB connection - */ - function end() { - $this->lb->closeAll(); - parent::end(); - } -} - -class DbTestRecorder extends DbTestPreviewer { - public $version; - - /** - * Set up result recording; insert a record for the run with the date - * and all that fun stuff - */ - function start() { - $this->db->begin( __METHOD__ ); - - if ( !$this->db->tableExists( 'testrun' ) - || !$this->db->tableExists( 'testitem' ) - ) { - print "WARNING> `testrun` table not found in database. Trying to create table.\n"; - $this->db->sourceFile( $this->db->patchPath( 'patch-testrun.sql' ) ); - echo "OK, resuming.\n"; - } - - parent::start(); - - $this->db->insert( 'testrun', - [ - 'tr_date' => $this->db->timestamp(), - 'tr_mw_version' => $this->version, - 'tr_php_version' => PHP_VERSION, - 'tr_db_version' => $this->db->getServerVersion(), - 'tr_uname' => php_uname() - ], - __METHOD__ ); - if ( $this->db->getType() === 'postgres' ) { - $this->curRun = $this->db->currentSequenceValue( 'testrun_id_seq' ); - } else { - $this->curRun = $this->db->insertId(); - } - } - - /** - * Record an individual test item's success or failure to the db - * - * @param string $test - * @param bool $result - */ - function record( $test, $subtest, $result ) { - parent::record( $test, $subtest, $result ); - - $this->db->insert( 'testitem', - [ - 'ti_run' => $this->curRun, - 'ti_name' => $this->getName( $test, $subtest ), - 'ti_success' => $result ? 1 : 0, - ], - __METHOD__ ); - } - - /** - * Commit transaction and clean up for result recording - */ - function end() { - $this->db->commit( __METHOD__ ); - parent::end(); - } -} - -class TestFileIterator implements Iterator { - private $file; - private $fh; - /** - * @var ParserTest|MediaWikiParserTest An instance of ParserTest (parserTests.php) - * or MediaWikiParserTest (phpunit) - */ - private $parserTest; - private $index = 0; - private $test; - private $section = null; - /** String|null: current test section being analyzed */ - private $sectionData = []; - private $lineNum; - private $eof; - # Create a fake parser tests which never run anything unless - # asked to do so. This will avoid running hooks for a disabled test - private $delayedParserTest; - private $nextSubTest = 0; - - function __construct( $file, $parserTest ) { - $this->file = $file; - $this->fh = fopen( $this->file, "rt" ); - - if ( !$this->fh ) { - throw new MWException( "Couldn't open file '$file'\n" ); - } - - $this->parserTest = $parserTest; - $this->delayedParserTest = new DelayedParserTest(); - - $this->lineNum = $this->index = 0; - } - - function rewind() { - if ( fseek( $this->fh, 0 ) ) { - throw new MWException( "Couldn't fseek to the start of '$this->file'\n" ); - } - - $this->index = -1; - $this->lineNum = 0; - $this->eof = false; - $this->next(); - - return true; - } - - function current() { - return $this->test; - } - - function key() { - return $this->index; - } - - function next() { - if ( $this->readNextTest() ) { - $this->index++; - return true; - } else { - $this->eof = true; - } - } - - function valid() { - return $this->eof != true; - } - - function setupCurrentTest() { - // "input" and "result" are old section names allowed - // for backwards-compatibility. - $input = $this->checkSection( [ 'wikitext', 'input' ], false ); - $result = $this->checkSection( [ 'html/php', 'html/*', 'html', 'result' ], false ); - // some tests have "with tidy" and "without tidy" variants - $tidy = $this->checkSection( [ 'html/php+tidy', 'html+tidy' ], false ); - if ( $tidy != false ) { - if ( $this->nextSubTest == 0 ) { - if ( $result != false ) { - $this->nextSubTest = 1; // rerun non-tidy variant later - } - $result = $tidy; - } else { - $this->nextSubTest = 0; // go on to next test after this - $tidy = false; - } - } - - if ( !isset( $this->sectionData['options'] ) ) { - $this->sectionData['options'] = ''; - } - - if ( !isset( $this->sectionData['config'] ) ) { - $this->sectionData['config'] = ''; - } - - $isDisabled = preg_match( '/\\bdisabled\\b/i', $this->sectionData['options'] ) && - !$this->parserTest->runDisabled; - $isParsoidOnly = preg_match( '/\\bparsoid\\b/i', $this->sectionData['options'] ) && - $result == 'html' && - !$this->parserTest->runParsoid; - $isFiltered = !preg_match( "/" . $this->parserTest->regex . "/i", $this->sectionData['test'] ); - if ( $input == false || $result == false || $isDisabled || $isParsoidOnly || $isFiltered ) { - # disabled test - return false; - } - - # We are really going to run the test, run pending hooks and hooks function - wfDebug( __METHOD__ . " unleashing delayed test for: {$this->sectionData['test']}" ); - $hooksResult = $this->delayedParserTest->unleash( $this->parserTest ); - if ( !$hooksResult ) { - # Some hook reported an issue. Abort. - throw new MWException( "Problem running requested parser hook from the test file" ); - } - - $this->test = [ - 'test' => ParserTest::chomp( $this->sectionData['test'] ), - 'subtest' => $this->nextSubTest, - 'input' => ParserTest::chomp( $this->sectionData[$input] ), - 'result' => ParserTest::chomp( $this->sectionData[$result] ), - 'options' => ParserTest::chomp( $this->sectionData['options'] ), - 'config' => ParserTest::chomp( $this->sectionData['config'] ), - ]; - if ( $tidy != false ) { - $this->test['options'] .= " tidy"; - } - return true; - } - - function readNextTest() { - # Run additional subtests of previous test - while ( $this->nextSubTest > 0 ) { - if ( $this->setupCurrentTest() ) { - return true; - } - } - - $this->clearSection(); - # Reset hooks for the delayed test object - $this->delayedParserTest->reset(); - - while ( false !== ( $line = fgets( $this->fh ) ) ) { - $this->lineNum++; - $matches = []; - - if ( preg_match( '/^!!\s*(\S+)/', $line, $matches ) ) { - $this->section = strtolower( $matches[1] ); - - if ( $this->section == 'endarticle' ) { - $this->checkSection( 'text' ); - $this->checkSection( 'article' ); - - $this->parserTest->addArticle( - ParserTest::chomp( $this->sectionData['article'] ), - $this->sectionData['text'], $this->lineNum ); - - $this->clearSection(); - - continue; - } - - if ( $this->section == 'endhooks' ) { - $this->checkSection( 'hooks' ); - - foreach ( explode( "\n", $this->sectionData['hooks'] ) as $line ) { - $line = trim( $line ); - - if ( $line ) { - $this->delayedParserTest->requireHook( $line ); - } - } - - $this->clearSection(); - - continue; - } - - if ( $this->section == 'endfunctionhooks' ) { - $this->checkSection( 'functionhooks' ); - - foreach ( explode( "\n", $this->sectionData['functionhooks'] ) as $line ) { - $line = trim( $line ); - - if ( $line ) { - $this->delayedParserTest->requireFunctionHook( $line ); - } - } - - $this->clearSection(); - - continue; - } - - if ( $this->section == 'endtransparenthooks' ) { - $this->checkSection( 'transparenthooks' ); - - foreach ( explode( "\n", $this->sectionData['transparenthooks'] ) as $line ) { - $line = trim( $line ); - - if ( $line ) { - $this->delayedParserTest->requireTransparentHook( $line ); - } - } - - $this->clearSection(); - - continue; - } - - if ( $this->section == 'end' ) { - $this->checkSection( 'test' ); - do { - if ( $this->setupCurrentTest() ) { - return true; - } - } while ( $this->nextSubTest > 0 ); - # go on to next test (since this was disabled) - $this->clearSection(); - $this->delayedParserTest->reset(); - continue; - } - - if ( isset( $this->sectionData[$this->section] ) ) { - throw new MWException( "duplicate section '$this->section' " - . "at line {$this->lineNum} of $this->file\n" ); - } - - $this->sectionData[$this->section] = ''; - - continue; - } - - if ( $this->section ) { - $this->sectionData[$this->section] .= $line; - } - } - - return false; - } - - /** - * Clear section name and its data - */ - private function clearSection() { - $this->sectionData = []; - $this->section = null; - - } - - /** - * Verify the current section data has some value for the given token - * name(s) (first parameter). - * Throw an exception if it is not set, referencing current section - * and adding the current file name and line number - * - * @param string|array $tokens Expected token(s) that should have been - * mentioned before closing this section - * @param bool $fatal True iff an exception should be thrown if - * the section is not found. - * @return bool|string - * @throws MWException - */ - private function checkSection( $tokens, $fatal = true ) { - if ( is_null( $this->section ) ) { - throw new MWException( __METHOD__ . " can not verify a null section!\n" ); - } - if ( !is_array( $tokens ) ) { - $tokens = [ $tokens ]; - } - if ( count( $tokens ) == 0 ) { - throw new MWException( __METHOD__ . " can not verify zero sections!\n" ); - } - - $data = $this->sectionData; - $tokens = array_filter( $tokens, function ( $token ) use ( $data ) { - return isset( $data[$token] ); - } ); - - if ( count( $tokens ) == 0 ) { - if ( !$fatal ) { - return false; - } - throw new MWException( sprintf( - "'%s' without '%s' at line %s of %s\n", - $this->section, - implode( ',', $tokens ), - $this->lineNum, - $this->file - ) ); - } - if ( count( $tokens ) > 1 ) { - throw new MWException( sprintf( - "'%s' with unexpected tokens '%s' at line %s of %s\n", - $this->section, - implode( ',', $tokens ), - $this->lineNum, - $this->file - ) ); - } - - return array_values( $tokens )[0]; - } -} - -/** - * An iterator for use as a phpunit data provider. Provides the test arguments - * in the order expected by NewParserTest::testParserTest(). - */ -class TestFileDataProvider extends TestFileIterator { - function current() { - $test = parent::current(); - if ( $test ) { - return [ - $test['test'], - $test['input'], - $test['result'], - $test['options'], - $test['config'], - ]; - } else { - return $test; - } - } -} - -/** - * A class to delay execution of a parser test hooks. - */ -class DelayedParserTest { - - /** Initialized on construction */ - private $hooks; - private $fnHooks; - private $transparentHooks; - - public function __construct() { - $this->reset(); - } - - /** - * Init/reset or forgot about the current delayed test. - * Call to this will erase any hooks function that were pending. - */ - public function reset() { - $this->hooks = []; - $this->fnHooks = []; - $this->transparentHooks = []; - } - - /** - * Called whenever we actually want to run the hook. - * Should be the case if we found the parserTest is not disabled - * @param ParserTest|NewParserTest $parserTest - * @return bool - * @throws MWException - */ - public function unleash( &$parserTest ) { - if ( !( $parserTest instanceof ParserTest || $parserTest instanceof NewParserTest ) ) { - throw new MWException( __METHOD__ . " must be passed an instance of ParserTest or " - . "NewParserTest classes\n" ); - } - - # Trigger delayed hooks. Any failure will make us abort - foreach ( $this->hooks as $hook ) { - $ret = $parserTest->requireHook( $hook ); - if ( !$ret ) { - return false; - } - } - - # Trigger delayed function hooks. Any failure will make us abort - foreach ( $this->fnHooks as $fnHook ) { - $ret = $parserTest->requireFunctionHook( $fnHook ); - if ( !$ret ) { - return false; - } - } - - # Trigger delayed transparent hooks. Any failure will make us abort - foreach ( $this->transparentHooks as $hook ) { - $ret = $parserTest->requireTransparentHook( $hook ); - if ( !$ret ) { - return false; - } - } - - # Delayed execution was successful. - return true; - } - - /** - * Similar to ParserTest object but does not run anything - * Use unleash() to really execute the hook - * @param string $hook - */ - public function requireHook( $hook ) { - $this->hooks[] = $hook; - } - - /** - * Similar to ParserTest object but does not run anything - * Use unleash() to really execute the hook function - * @param string $fnHook - */ - public function requireFunctionHook( $fnHook ) { - $this->fnHooks[] = $fnHook; - } - - /** - * Similar to ParserTest object but does not run anything - * Use unleash() to really execute the hook function - * @param string $hook - */ - public function requireTransparentHook( $hook ) { - $this->transparentHooks[] = $hook; - } - -} - -/** - * Initialize and detect the DjVu files support - */ -class DjVuSupport { - - /** - * Initialises DjVu tools global with default values - */ - public function __construct() { - global $wgDjvuRenderer, $wgDjvuDump, $wgDjvuToXML, $wgFileExtensions, $wgDjvuTxt; - - $wgDjvuRenderer = $wgDjvuRenderer ? $wgDjvuRenderer : '/usr/bin/ddjvu'; - $wgDjvuDump = $wgDjvuDump ? $wgDjvuDump : '/usr/bin/djvudump'; - $wgDjvuToXML = $wgDjvuToXML ? $wgDjvuToXML : '/usr/bin/djvutoxml'; - $wgDjvuTxt = $wgDjvuTxt ? $wgDjvuTxt : '/usr/bin/djvutxt'; - - if ( !in_array( 'djvu', $wgFileExtensions ) ) { - $wgFileExtensions[] = 'djvu'; - } - } - - /** - * Returns true if the DjVu tools are usable - * - * @return bool - */ - public function isEnabled() { - global $wgDjvuRenderer, $wgDjvuDump, $wgDjvuToXML, $wgDjvuTxt; - - return is_executable( $wgDjvuRenderer ) - && is_executable( $wgDjvuDump ) - && is_executable( $wgDjvuToXML ) - && is_executable( $wgDjvuTxt ); - } -} - -/** - * Initialize and detect the tidy support - */ -class TidySupport { - private $enabled; - private $config; - - /** - * Determine if there is a usable tidy. - */ - public function __construct( $useConfiguration = false ) { - global $IP, $wgUseTidy, $wgTidyBin, $wgTidyInternal, $wgTidyConfig, - $wgTidyConf, $wgTidyOpts; - - $this->enabled = true; - if ( $useConfiguration ) { - if ( $wgTidyConfig !== null ) { - $this->config = $wgTidyConfig; - } elseif ( $wgUseTidy ) { - $this->config = [ - 'tidyConfigFile' => $wgTidyConf, - 'debugComment' => false, - 'tidyBin' => $wgTidyBin, - 'tidyCommandLine' => $wgTidyOpts - ]; - if ( $wgTidyInternal ) { - $this->config['driver'] = wfIsHHVM() ? 'RaggettInternalHHVM' : 'RaggettInternalPHP'; - } else { - $this->config['driver'] = 'RaggettExternal'; - } - } else { - $this->enabled = false; - } - } else { - $this->config = [ - 'tidyConfigFile' => "$IP/includes/tidy/tidy.conf", - 'tidyCommandLine' => '', - ]; - if ( extension_loaded( 'tidy' ) && class_exists( 'tidy' ) ) { - $this->config['driver'] = wfIsHHVM() ? 'RaggettInternalHHVM' : 'RaggettInternalPHP'; - } else { - if ( is_executable( $wgTidyBin ) ) { - $this->config['driver'] = 'RaggettExternal'; - $this->config['tidyBin'] = $wgTidyBin; - } else { - $path = Installer::locateExecutableInDefaultPaths( $wgTidyBin ); - if ( $path !== false ) { - $this->config['driver'] = 'RaggettExternal'; - $this->config['tidyBin'] = $wgTidyBin; - } else { - $this->enabled = false; - } - } - } - } - if ( !$this->enabled ) { - $this->config = [ 'driver' => 'disabled' ]; - } - } - - /** - * Returns true if tidy is usable - * - * @return bool - */ - public function isEnabled() { - return $this->enabled; - } - - public function getConfig() { - return $this->config; - } -}

$sorry

Source

Contents

test test test[edit]