1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
|
<?php
use MediaWiki\Api\ApiUsageException;
use MediaWiki\MainConfigNames;
use MediaWiki\Title\TitleValue;
use MediaWiki\User\Options\UserOptionsLookup;
use MediaWiki\User\User;
/**
* @group Database
*
* @covers \MediaWiki\Watchlist\WatchedItemQueryService
*/
class WatchedItemQueryServiceIntegrationTest extends MediaWikiIntegrationTestCase {
protected function setUp(): void {
parent::setUp();
$this->overrideConfigValue( MainConfigNames::WatchlistExpiry, true );
}
public function testGetWatchedItemsForUser(): void {
$store = $this->getServiceContainer()->getWatchedItemStore();
$queryService = $this->getServiceContainer()->getWatchedItemQueryService();
$user = self::getTestUser()->getUser();
$initialCount = count( $store->getWatchedItemsForUser( $user ) );
// Add two watched items, one of which is already expired, and check that only 1 is returned.
$store->addWatch(
$user,
new TitleValue( 0, __METHOD__ . ' no expiry 1' )
);
$store->addWatch(
$user,
new TitleValue( 0, __METHOD__ . ' expired a week ago or in a week' ),
'1 week ago'
);
$result1 = $queryService->getWatchedItemsForUser( $user );
$this->assertCount( $initialCount + 1, $result1, "User ID: " . $user->getId() );
// Add another of each type of item, and make sure the new results are as expected.
$store->addWatch(
$user,
new TitleValue( 0, __METHOD__ . ' no expiry 2' )
);
$store->addWatch(
$user,
new TitleValue( 0, __METHOD__ . ' expired a week ago 2' ),
'1 week ago'
);
$result2 = $queryService->getWatchedItemsForUser( $user );
$this->assertCount( $initialCount + 2, $result2 );
// Make one of the expired items permanent, and check again.
$store->addWatch(
$user,
new TitleValue( 0, __METHOD__ . ' expired a week ago 2' ),
'infinity'
);
$result3 = $queryService->getWatchedItemsForUser( $user );
$this->assertCount( $initialCount + 3, $result3 );
// Make the other expired item expire in a week's time, and make sure it appears in the list.
$store->addWatch(
$user,
new TitleValue( 0, __METHOD__ . ' expired a week ago or in a week' ),
'1 week'
);
$result4 = $queryService->getWatchedItemsForUser( $user );
$this->assertCount( $initialCount + 4, $result4 );
}
public function testGetWatchedItemsForUserWithExpiriesDisabled() {
$this->overrideConfigValue( MainConfigNames::WatchlistExpiry, false );
$store = $this->getServiceContainer()->getWatchedItemStore();
$queryService = $this->getServiceContainer()->getWatchedItemQueryService();
$user = self::getTestUser()->getUser();
$initialCount = count( $store->getWatchedItemsForUser( $user ) );
$store->addWatch( $user, new TitleValue( 0, __METHOD__ ), '1 week ago' );
$result = $queryService->getWatchedItemsForUser( $user );
$this->assertCount( $initialCount + 1, $result );
}
public function testGetWatchedItemsWithRecentChangeInfo_watchlistExpiry(): void {
$store = $this->getServiceContainer()->getWatchedItemStore();
$queryService = $this->getServiceContainer()->getWatchedItemQueryService();
$user = self::getTestUser()->getUser();
$options = [];
$startFrom = null;
$initialCount = count( $queryService->getWatchedItemsWithRecentChangeInfo( $user,
$options, $startFrom ) );
// Add two watched items, one of which is already expired, and check that only 1 is returned.
$userEditTarget1 = new TitleValue( 0, __METHOD__ . ' no expiry 1' );
$this->editPage( $userEditTarget1, 'First revision' );
$store->addWatch(
$user,
$userEditTarget1
);
$userEditTarget2 = new TitleValue( 0, __METHOD__ . ' expired a week ago or in a week' );
$this->editPage( $userEditTarget2, 'First revision' );
$store->addWatch(
$user,
$userEditTarget2,
'1 week ago'
);
$result1 = $queryService->getWatchedItemsWithRecentChangeInfo( $user, $options, $startFrom );
$this->assertCount( $initialCount + 1, $result1 );
// Add another of each type of item, and make sure the new results are as expected.
$userEditTarget3 = new TitleValue( 0, __METHOD__ . ' no expiry 2' );
$this->editPage( $userEditTarget3, 'First revision' );
$store->addWatch(
$user,
$userEditTarget3
);
$userEditTarget4 = new TitleValue( 0, __METHOD__ . ' expired a week ago 2' );
$this->editPage( $userEditTarget4, 'First revision' );
$store->addWatch(
$user,
$userEditTarget4,
'1 week ago'
);
$result2 = $queryService->getWatchedItemsWithRecentChangeInfo( $user );
$this->assertCount( $initialCount + 2, $result2 );
// Make one of the expired items permanent, and check again.
$store->addWatch(
$user,
$userEditTarget4,
'infinity'
);
$result3 = $queryService->getWatchedItemsWithRecentChangeInfo( $user );
$this->assertCount( $initialCount + 3, $result3 );
// Make the other expired item expire in a week's time, and make sure it appears in the list.
$store->addWatch(
$user,
$userEditTarget2,
'1 week'
);
$result4 = $queryService->getWatchedItemsWithRecentChangeInfo( $user );
$this->assertCount( $initialCount + 4, $result4 );
}
public static function invalidWatchlistTokenProvider() {
return [
[ 'wrongToken' ],
[ '' ],
];
}
/**
* @dataProvider invalidWatchlistTokenProvider
*/
public function testGetWatchedItemsWithRecentChangeInfo_watchlistOwnerAndInvalidToken( $token ) {
// Moved from the Unit test because the ApiUsageException call creates a Message object
// and down the line needs MediaWikiServices
$user = $this->createNoOpMock(
User::class,
[ 'isRegistered', 'getId', 'useRCPatrol' ]
);
$user->method( 'isRegistered' )->willReturn( true );
$user->method( 'getId' )->willReturn( 1 );
$user->method( 'useRCPatrol' )->willReturn( true );
$otherUser = $this->createNoOpMock(
User::class,
[ 'isRegistered', 'getId', 'useRCPatrol' ]
);
$otherUser->method( 'isRegistered' )->willReturn( true );
$otherUser->method( 'getId' )->willReturn( 2 );
$otherUser->method( 'useRCPatrol' )->willReturn( true );
$userOptionsLookup = $this->createMock( UserOptionsLookup::class );
$userOptionsLookup->expects( $this->once() )
->method( 'getOption' )
->with( $otherUser, 'watchlisttoken' )
->willReturn( '0123456789abcdef' );
$this->setService( 'UserOptionsLookup', $userOptionsLookup );
$queryService = $this->getServiceContainer()->getWatchedItemQueryService();
$this->expectException( ApiUsageException::class );
$this->expectExceptionMessage( 'Incorrect watchlist token provided' );
$queryService->getWatchedItemsWithRecentChangeInfo(
$user,
[ 'watchlistOwner' => $otherUser, 'watchlistOwnerToken' => $token ]
);
}
}
|
