Merge branch 'master' into trinidad

1 files changed, 0 insertions, 51 deletions

diff --git a/library/intl/tests/LocaleResolverTest.php b/library/intl/tests/LocaleResolverTest.php
deleted file mode 100644
index a52dea353..000000000
--- a/library/intl/tests/LocaleResolverTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace CommerceGuys\Intl\Tests;
-
-use org\bovigo\vfs\vfsStream;
-
-/**
- * @coversDefaultClass \CommerceGuys\Intl\LocaleResolverTrait
- */
-class LocaleResolverTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var DummyRepository
-     */
-    protected $repository;
-
-    public function setUp()
-    {
-        // Simulate the presence of various definitions.
-        $root = vfsStream::setup('resources');
-        vfsStream::newFile('dummy/bs-Cyrl.json')->at($root)->setContent('');
-        vfsStream::newFile('dummy/bs.json')->at($root)->setContent('');
-        vfsStream::newFile('dummy/en.json')->at($root)->setContent('');
-
-        $this->repository = new DummyRepository();
-    }
-
-    /**
-     * @covers ::resolveLocale
-     * @covers ::getLocaleVariants
-     */
-    public function testLocaleFallback()
-    {
-        $locale = $this->repository->runResolveLocale('bs-Cyrl-BA');
-        $this->assertEquals('bs-Cyrl', $locale);
-        $locale = $this->repository->runResolveLocale('bs-Latn-BA');
-        $this->assertEquals('bs', $locale);
-        $locale = $this->repository->runResolveLocale('de', 'en');
-        $this->assertEquals('en', $locale);
-    }
-
-    /**
-     * @covers ::resolveLocale
-     * @covers ::getLocaleVariants
-     * @expectedException \CommerceGuys\Intl\Exception\UnknownLocaleException
-     */
-    public function testInvalidLocale()
-    {
-        $locale = $this->repository->runResolveLocale('de');
-    }
-}