Skip to content

Commit 4f2cfa4

Browse files
notbakanekonotbakaneko
committed
check for search results ordering if they're not sorted by relevancy.
Added note and skip asserting order for relevancy tests.
1 parent 0016415 commit 4f2cfa4

13 files changed

Lines changed: 89 additions & 57 deletions

‎database/factories/BeatmapsetFactory.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,20 @@ public function deleted()
5252
return $this->state(['deleted_at' => now()]);
5353
}
5454

55+
// Sets search scorable fields to the same value.
56+
// The relevancy score between different runs will still be different.
57+
public function fixedStrings(): static
58+
{
59+
return $this->state([
60+
'artist' => 'test',
61+
'creator' => 'test',
62+
'source' => 'test',
63+
'tags' => 'test',
64+
'title' => 'test',
65+
'favourite_count' => 0,
66+
]);
67+
}
68+
5569
public function inactive()
5670
{
5771
return $this->state(['active' => 0]);

‎tests/Libraries/Search/BeatmapsetSearch/ConvertsFilterTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ class ConvertsFilterTest extends TestCase
1515
public static function dataProvider(): array
1616
{
1717
return [
18-
[['q' => 'cs=4'], [1, 2]],
18+
[['q' => 'cs=4'], [2, 1]],
1919
[['m' => 0, 'q' => 'cs=4'], [1]],
2020
[['m' => 3, 'q' => 'cs=4'], [2]],
2121

22-
[['c' => 'converts', 'q' => 'cs=4',], [0, 1, 2]],
22+
[['c' => 'converts', 'q' => 'cs=4',], [2, 1, 0]],
2323
[['c' => 'converts', 'm' => 0, 'q' => 'cs=4',], [1]],
24-
[['c' => 'converts', 'm' => 3, 'q' => 'cs=4'], [0, 2]],
24+
[['c' => 'converts', 'm' => 3, 'q' => 'cs=4'], [2, 0]],
2525
];
2626
}
2727

‎tests/Libraries/Search/BeatmapsetSearch/CreatorFilterTest.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,25 @@
1212

1313
class CreatorFilterTest extends TestCase
1414
{
15+
protected array $defaultExpectedSort = ['_score', 'id'];
16+
1517
public static function dataProvider(): array
1618
{
1719
return [
18-
'include lookup user' => [['q' => 'creator=mapper'], [0, 1]],
20+
'include lookup user' => [['q' => 'creator=mapper'], [1, 0]],
1921
'include non-lookup user' => [['q' => 'creator=someone'], [0, 3]],
2022
];
2123
}
2224

2325
public static function setUpBeforeClass(): void
2426
{
2527
static::withDbAccess(function () {
26-
$factory = Beatmapset::factory()->withBeatmaps()->ranked();
28+
$factory = Beatmapset::factory()->fixedStrings()->withBeatmaps(beatmapState: ['version' => 'test'])->ranked();
2729
$mapper1 = User::factory()->create(['username' => 'mapper']);
2830
$mapper2 = User::factory()->create(['username' => 'another_mapper']);
2931

3032
static::$beatmapsets = [
31-
$factory->withBeatmaps(guestMapper: $mapper1)->create(['creator' => 'someone']),
33+
$factory->withBeatmaps(guestMapper: $mapper1, beatmapState: ['version' => 'test2'])->create(['creator' => 'someone']),
3234
$factory->create(['user_id' => $mapper1]),
3335
$factory->create(['user_id' => $mapper2]),
3436
$factory->create(['creator' => 'someone_else']),

‎tests/Libraries/Search/BeatmapsetSearch/DateFilterTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ public static function dataProvider(): array
2222
// BeatmapsetQueryParserTest will test the other date formats are equivalent.
2323
$year = 2023 + $index;
2424

25-
$data[] = [['q' => "{$key}={$year}"], [2, 3, 4]];
26-
$data[] = [['q' => "{$key}={$year}-02"], [2, 3]];
25+
$data[] = [['q' => "{$key}={$year}"], [4, 3, 2]];
26+
$data[] = [['q' => "{$key}={$year}-02"], [3, 2]];
2727
$data[] = [['q' => "{$key}={$year}-02-28"], [3]];
28-
$data[] = [['q' => "{$key}={$year}"], [2, 3, 4]];
28+
$data[] = [['q' => "{$key}={$year}"], [4, 3, 2]];
2929

3030
$year = 2022 + $index;
31-
$data[] = [['q' => "{$key}>{$year}"], [2, 3, 4]];
32-
$data[] = [['q' => "{$key}>={$year}"], [1, 2, 3, 4]];
31+
$data[] = [['q' => "{$key}>{$year}"], [4, 3, 2]];
32+
$data[] = [['q' => "{$key}>={$year}"], [4, 3, 2, 1]];
3333
$data[] = [['q' => "{$key}<{$year}"], [0]];
34-
$data[] = [['q' => "{$key}<={$year}"], [0, 1]];
34+
$data[] = [['q' => "{$key}<={$year}"], [1, 0]];
3535
}
3636

3737
return $data;

‎tests/Libraries/Search/BeatmapsetSearch/DifficultyFilterTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class DifficultyFilterTest extends TestCase
1515
public static function dataProvider(): array
1616
{
1717
return [
18-
[['q' => 'difficulty=hard'], [1, 2]],
18+
[['q' => 'difficulty=hard'], [2, 1]],
1919
[['q' => 'difficulty="very mapper"'], [2]],
2020
[['q' => 'difficulty="very hard"'], []],
2121
[['q' => 'difficulty=""very easy""'], [0]],

‎tests/Libraries/Search/BeatmapsetSearch/FeaturedArtistFilterTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class FeaturedArtistFilterTest extends TestCase
1717
public static function dataProvider(): array
1818
{
1919
return [
20-
[['q' => 'featured_artist=1'], [0, 2, 4]],
21-
[['c' => 'featured_artists'], [0, 1, 2, 3, 4, 5]],
20+
[['q' => 'featured_artist=1'], [4, 2, 0]],
21+
[['c' => 'featured_artists'], [5, 4, 3, 2, 1, 0]],
2222
];
2323
}
2424

‎tests/Libraries/Search/BeatmapsetSearch/ManiaKeysFilterTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ManiaKeysFilterTest extends TestCase
1414
public static function dataProvider(): array
1515
{
1616
return [
17-
[['q' => 'keys=7'], [1, 3]],
17+
[['q' => 'keys=7'], [3, 1]],
1818
];
1919
}
2020

‎tests/Libraries/Search/BeatmapsetSearch/NegativeBoostTest.php‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77

88
namespace Tests\Libraries\Search\BeatmapsetSearch;
99

10-
use App\Libraries\Search\BeatmapsetSearch;
11-
use App\Libraries\Search\BeatmapsetSearchRequestParams;
1210
use App\Models\Beatmapset;
13-
use PHPUnit\Framework\Attributes\DataProvider;
1411

1512
class NegativeBoostTest extends TestCase
1613
{
14+
protected array $defaultExpectedSort = ['_score', 'id'];
15+
1716
public static function dataProvider(): array
1817
{
1918
return [
@@ -26,8 +25,7 @@ public static function dataProvider(): array
2625
public static function setUpBeforeClass(): void
2726
{
2827
static::withDbAccess(function () {
29-
// use something besides empty string so it doesn't match empty string.
30-
$factory = Beatmapset::factory()->state(['artist' => 'a', 'creator' => 'a', 'favourite_count' => 0])->ranked()->withBeatmaps();
28+
$factory = Beatmapset::factory()->fixedStrings()->ranked()->withBeatmaps(beatmapState: ['version' => 'test']);
3129
static::$beatmapsets = [
3230
$factory->create(['tags' => 'too hoos', 'title' => 'Good Apple']),
3331
$factory->create(['tags' => 'fruit cake', 'title' => 'Apple']),
@@ -37,13 +35,4 @@ public static function setUpBeforeClass(): void
3735
});
3836
parent::setUpBeforeClass();
3937
}
40-
41-
#[DataProvider('dataProvider')]
42-
public function testSearch(array $params, array $expected): void
43-
{
44-
$this->assertEquals(
45-
array_map(fn (int $index) => static::$beatmapsets[$index]->getKey(), $expected),
46-
new BeatmapsetSearch(new BeatmapsetSearchRequestParams($params))->response()->ids()
47-
);
48-
}
4938
}

‎tests/Libraries/Search/BeatmapsetSearch/QueryStringTest.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
class QueryStringTest extends TestCase
1313
{
14+
protected array $defaultExpectedSort = ['_score', 'id'];
15+
1416
public static function dataProvider(): array
1517
{
16-
// TODO: support scoring order in tests.
1718
return [
18-
[['q' => ''], [0, 1, 2, 3]],
19+
[['q' => ''], [3, 2, 1, 0], ['approved_date', 'id']],
1920
[['q' => '2'], [1]], // id only search.
2021
[['q' => '2 3'], []], // putting more than one id becomes a normal string search.
2122
[['q' => 'triangles'], [0, 1, 3]],
@@ -26,15 +27,15 @@ public static function dataProvider(): array
2627
[['q' => 'tri'], [0, 1, 3]],
2728
[['q' => 'tri -circ'], [0, 1, 3]],
2829
[['q' => 'tri -circle'], [0, 1, 3]],
29-
[['q' => '-tri'], [0, 1, 2, 3]],
30+
[['q' => '-tri'], [3, 2, 1, 0]],
3031
];
3132
}
3233

3334
public static function setUpBeforeClass(): void
3435
{
3536
static::withDbAccess(function () {
3637
// use something besides empty string so it doesn't match empty string.
37-
$factory = Beatmapset::factory()->state(['artist' => 'a', 'creator' => 'a'])->ranked()->withBeatmaps();
38+
$factory = Beatmapset::factory()->state(['artist' => 'a', 'creator' => 'a', 'favourite_count' => 0])->ranked()->withBeatmaps();
3839
static::$beatmapsets = [
3940
$factory->create(['title' => 'Triangles']),
4041
$factory->create(['title' => 'Triangles Revival']),

‎tests/Libraries/Search/BeatmapsetSearch/SimpleFilterTest.php‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
class SimpleFilterTest extends TestCase
1515
{
16+
protected array $defaultExpectedSort = ['approved_date', 'id'];
17+
1618
// Date tests in DateFilterTest
1719
private const KEYS = [
1820
'ar' => 'diff_approach',
@@ -31,23 +33,23 @@ public static function dataProvider(): array
3133
$data = [];
3234
foreach (array_keys(static::KEYS) as $offset => $key) {
3335
$value = $offset + 2;
34-
$data[] = [['q' => "{$key}={$value}"], [0, 1]];
35-
$data[] = [['q' => "{$key}>{$value}"], [1, 2]];
36-
$data[] = [['q' => "{$key}>={$value}"], [0, 1, 2]];
36+
$data[] = [['q' => "{$key}={$value}"], [1, 0]];
37+
$data[] = [['q' => "{$key}>{$value}"], [2, 1]];
38+
$data[] = [['q' => "{$key}>={$value}"], [2, 1, 0]];
3739
$data[] = [['q' => "{$key}<{$value}"], [0]];
38-
$data[] = [['q' => "{$key}<={$value}"], [0, 1]];
40+
$data[] = [['q' => "{$key}<={$value}"], [1, 0]];
3941
}
4042

4143
$data[] = [['q' => 'od>9 ar<3'], []];
4244

4345
$data[] = [['q' => 'favourites=150'], []]; // if you really want an exact number of favourites...
4446
$data[] = [['q' => 'favourites>200'], [2]];
45-
$data[] = [['q' => 'favourites>=200'], [1, 2]];
47+
$data[] = [['q' => 'favourites>=200'], [2, 1]];
4648
$data[] = [['q' => 'favourites<200'], [0]];
47-
$data[] = [['q' => 'favourites<=200'], [0, 1]];
49+
$data[] = [['q' => 'favourites<=200'], [1, 0]];
4850

49-
$data[] = [['q' => 'od>7'], [0, 1, 2]];
50-
$data[] = [['q' => 'od>7 favourites>123'], [1, 2]];
51+
$data[] = [['q' => 'od>7'], [2, 1, 0]];
52+
$data[] = [['q' => 'od>7 favourites>123'], [2, 1]];
5153

5254
// no matches because there is no beatmap that matches both conditions
5355
// even though the beatmapset has both in different beatmaps.

0 commit comments

Comments
 (0)