RCFilters: define consistent interface in ChangesListFilterGroup

[lhc/web/wiklou.git] / tests / phpunit / includes / changes / ChangesListStringOptionsFilterGroupTest.php

diff --git a/tests/phpunit/includes/changes/ChangesListStringOptionsFilterGroupTest.php b/tests/phpunit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
index 0f556b8..acac26f 100644 (file)
--- a/tests/phpunit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
+++ b/tests/phpunit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Wikimedia\TestingAccessWrapper;
+
 /**
  * @covers ChangesListStringOptionsFilterGroup
  */
@@ -38,8 +40,6 @@ class ChangesListStringOptionsFilterGroupTest extends MediaWikiTestCase {
         * @dataProvider provideModifyQuery
         */
        public function testModifyQuery( $filterDefinitions, $expectedValues, $input ) {
-               $self = $this;
-
                $queryCallable = function (
                        $className,
                        $ctx,
@@ -50,8 +50,8 @@ class ChangesListStringOptionsFilterGroupTest extends MediaWikiTestCase {
                        &$query_options,
                        &$join_conds,
                        $actualSelectedValues
-               ) use ( $self, $expectedValues ) {
-                       $self->assertSame(
+               ) use ( $expectedValues ) {
+                       $this->assertSame(
                                $expectedValues,
                                $actualSelectedValues
                        );
@@ -190,6 +190,8 @@ class ChangesListStringOptionsFilterGroupTest extends MediaWikiTestCase {
                $group = new ChangesListStringOptionsFilterGroup( $groupDefinition );
 
                $specialPage = $this->getSpecialPage();
+               $opts = new FormOptions();
+               $opts->add( $groupDefinition[ 'name' ], $input );
 
                $group->modifyQuery(
                        $dbr,
@@ -199,7 +201,8 @@ class ChangesListStringOptionsFilterGroupTest extends MediaWikiTestCase {
                        $conds,
                        $query_options,
                        $join_conds,
-                       $input
+                       $opts,
+                       true
                );
        }
 
@@ -247,6 +250,7 @@ class ChangesListStringOptionsFilterGroupTest extends MediaWikiTestCase {
                                                'cssClass' => null,
                                                'conflicts' => [],
                                                'subset' => [],
+                                               'defaultHighlightColor' => null,
                                        ],
                                        [
                                                'name' => 'foo',
@@ -256,6 +260,7 @@ class ChangesListStringOptionsFilterGroupTest extends MediaWikiTestCase {
                                                'cssClass' => null,
                                                'conflicts' => [],
                                                'subset' => [],
+                                               'defaultHighlightColor' => null,
                                        ],
                                ],
                                'conflicts' => [],