Skip to content

Commit 928bdc6

Browse files
ivanvermeyenivanvermeyen
committed
Update Filter tests
1 parent 074c8f3 commit 928bdc6

File tree

5 files changed

+36
-35
lines changed

5 files changed

+36
-35
lines changed

‎tests/Filters/CombinedFilterTest.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,27 @@
22

33
namespace CodeZero\BrowserLocale\Tests\Filters;
44

5-
use CodeZero\BrowserLocale\BrowserLocale;
65
use CodeZero\BrowserLocale\Filters\CombinedFilter;
6+
use CodeZero\BrowserLocale\Locale;
77
use PHPUnit\Framework\TestCase;
88

99
class CombinedFilterTest extends TestCase
1010
{
1111
/** @test */
1212
public function it_returns_a_combined_array_of_locales_and_languages()
1313
{
14-
$browser = new BrowserLocale('en-US,nl;q=0.8');
15-
16-
$locales = $browser->filter(new CombinedFilter);
14+
$locales = (new CombinedFilter)->filter([
15+
new Locale('en-US', 'en', 'US', 1.0),
16+
new Locale('nl', 'nl', '', 0.8),
17+
]);
1718

1819
$this->assertEquals(['en-US', 'en', 'nl'], $locales);
1920
}
2021

2122
/** @test */
2223
public function it_returns_an_empty_array_if_no_locales_exist()
2324
{
24-
$browser = new BrowserLocale('');
25-
26-
$locales = $browser->filter(new CombinedFilter);
25+
$locales = (new CombinedFilter)->filter([]);
2726

2827
$this->assertEquals([], $locales);
2928
}

‎tests/Filters/CountryFilterTest.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@
22

33
namespace CodeZero\BrowserLocale\Tests\Filters;
44

5-
use CodeZero\BrowserLocale\BrowserLocale;
65
use CodeZero\BrowserLocale\Filters\CountryFilter;
6+
use CodeZero\BrowserLocale\Locale;
77
use PHPUnit\Framework\TestCase;
88

99
class CountryFilterTest extends TestCase
1010
{
1111
/** @test */
1212
public function it_returns_a_simple_array_of_country_codes()
1313
{
14-
$browser = new BrowserLocale('en-US,en;q=0.8,nl-NL;q=0.6,nl;q=0.4');
15-
16-
$locales = $browser->filter(new CountryFilter);
14+
$locales = (new CountryFilter)->filter([
15+
new Locale('en-US', 'en', 'US', 1.0),
16+
new Locale('en', 'en', '', 0.8),
17+
new Locale('nl-NL', 'nl', 'NL', 0.6),
18+
new Locale('nl', 'nl', '', 0.4),
19+
]);
1720

1821
$this->assertEquals(['US', 'NL'], $locales);
1922
}
2023

2124
/** @test */
2225
public function it_returns_an_empty_array_if_no_locales_exist()
2326
{
24-
$browser = new BrowserLocale('');
25-
26-
$locales = $browser->filter(new CountryFilter);
27+
$locales = (new CountryFilter)->filter([]);
2728

2829
$this->assertEquals([], $locales);
2930
}

‎tests/Filters/LanguageFilterTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22

33
namespace CodeZero\BrowserLocale\Tests\Filters;
44

5-
use CodeZero\BrowserLocale\BrowserLocale;
65
use CodeZero\BrowserLocale\Filters\LanguageFilter;
6+
use CodeZero\BrowserLocale\Locale;
77
use PHPUnit\Framework\TestCase;
88

99
class LanguageFilterTest extends TestCase
1010
{
1111
/** @test */
1212
public function it_returns_a_simple_array_of_language_codes()
1313
{
14-
$browser = new BrowserLocale('en-US,en;q=0.8,nl-NL;q=0.6');
15-
16-
$locales = $browser->filter(new LanguageFilter);
14+
$locales = (new LanguageFilter)->filter([
15+
new Locale('en-US', 'en', 'US', 1.0),
16+
new Locale('en', 'en', '', 0.8),
17+
new Locale('nl-NL', 'nl', 'NL', 0.6),
18+
]);
1719

1820
$this->assertEquals(['en', 'nl'], $locales);
1921
}
2022

2123
/** @test */
2224
public function it_returns_an_empty_array_if_no_locales_exist()
2325
{
24-
$browser = new BrowserLocale('');
25-
26-
$locales = $browser->filter(new LanguageFilter);
26+
$locales = (new LanguageFilter)->filter([]);
2727

2828
$this->assertEquals([], $locales);
2929
}

‎tests/Filters/LocaleFilterTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22

33
namespace CodeZero\BrowserLocale\Tests\Filters;
44

5-
use CodeZero\BrowserLocale\BrowserLocale;
65
use CodeZero\BrowserLocale\Filters\LocaleFilter;
6+
use CodeZero\BrowserLocale\Locale;
77
use PHPUnit\Framework\TestCase;
88

99
class BrowserLocaleTest extends TestCase
1010
{
1111
/** @test */
1212
public function it_filters_a_simple_array_of_locales()
1313
{
14-
$browser = new BrowserLocale('en-US,en;q=0.8,nl-NL;q=0.6');
15-
16-
$locales = $browser->filter(new LocaleFilter);
14+
$locales = (new LocaleFilter)->filter([
15+
new Locale('en-US', 'en', 'US', 1.0),
16+
new Locale('en', 'en', '', 0.8),
17+
new Locale('nl-NL', 'nl', 'NL', 0.6),
18+
]);
1719

1820
$this->assertEquals(['en-US', 'en', 'nl-NL'], $locales);
1921
}
2022

2123
/** @test */
2224
public function it_returns_an_empty_array_if_no_locales_exist()
2325
{
24-
$browser = new BrowserLocale('');
25-
26-
$locales = $browser->filter(new LocaleFilter);
26+
$locales = (new LocaleFilter)->filter([]);
2727

2828
$this->assertEquals([], $locales);
2929
}

‎tests/Filters/WeightFilterTest.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@
22

33
namespace CodeZero\BrowserLocale\Tests\Filters;
44

5-
use CodeZero\BrowserLocale\BrowserLocale;
65
use CodeZero\BrowserLocale\Filters\WeightFilter;
6+
use CodeZero\BrowserLocale\Locale;
77
use PHPUnit\Framework\TestCase;
88

99
class WeightFilterTest extends TestCase
1010
{
1111
/** @test */
1212
public function it_returns_a_simple_array_of_weight_values()
1313
{
14-
$browser = new BrowserLocale('en-US,en;q=0.8,nl-NL;q=0.6,nl;q=0.4');
15-
16-
$locales = $browser->filter(new WeightFilter);
14+
$locales = (new WeightFilter)->filter([
15+
new Locale('en-US', 'en', 'US', 1.0),
16+
new Locale('en', 'en', '', 0.8),
17+
new Locale('nl-NL', 'nl', 'NL', 0.6),
18+
new Locale('nl', 'nl', '', 0.4),
19+
]);
1720

1821
$this->assertEquals([1.0, 0.8, 0.6, 0.4], $locales);
1922
}
2023

2124
/** @test */
2225
public function it_returns_an_empty_array_if_no_locales_exist()
2326
{
24-
$browser = new BrowserLocale('');
25-
26-
$locales = $browser->filter(new WeightFilter);
27+
$locales = (new WeightFilter)->filter([]);
2728

2829
$this->assertEquals([], $locales);
2930
}

0 commit comments

Comments
 (0)