[Intl] Improved test coverage of BinaryBundleReader

symfony · webmozart · Oct 2, 2013 · Oct 2, 2013 · Oct 2, 2013 · Oct 2, 2013
commit 2bb250879ced8bb03d1f50f7ba835146b48f8dea
diff --git a/src/Symfony/Component/Intl/ResourceBundle/Reader/BinaryBundleReader.php b/src/Symfony/Component/Intl/ResourceBundle/Reader/BinaryBundleReader.php
@@ -46,7 +46,7 @@ public function read($path, $locale)
        // instead.
        // Note that fallback to default is only working when a bundle contains
        // a root.res file.
-        if (U_USING_DEFAULT_WARNING === $bundle->getErrorCode()) {
+        if (in_array($bundle->getErrorCode(), array(U_USING_DEFAULT_WARNING, U_USING_FALLBACK_WARNING), true)) {
            throw new NoSuchLocaleException(sprintf(
                'Could not load the resource bundle "%s" for locale "%s".',
                $path,

diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BinaryBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BinaryBundleReaderTest.php
@@ -33,26 +33,68 @@ protected function setUp()

    public function testReadReturnsArrayAccess()
    {
-        $data = $this->reader->read(__DIR__.'/Fixtures', 'en');
+        $data = $this->reader->read(__DIR__.'/Fixtures/res', 'ro');

        $this->assertInstanceOf('\ArrayAccess', $data);
        $this->assertSame('Bar', $data['Foo']);
        $this->assertFalse(isset($data['ExistsNot']));
    }

+    public function testReadFollowsAlias()
+    {
+        // "alias" = "ro"
+        $data = $this->reader->read(__DIR__.'/Fixtures/res', 'alias');
+
+        $this->assertInstanceOf('\ArrayAccess', $data);
+        $this->assertSame('Bar', $data['Foo']);
+        $this->assertFalse(isset($data['ExistsNot']));
+    }
+
+    public function testReadFollowsFallback()
+    {
+        // "ro_MD" -> "ro"
+        $data = $this->reader->read(__DIR__.'/Fixtures/res', 'ro_MD');
+
+        $this->assertInstanceOf('\ArrayAccess', $data);
+        $this->assertSame('Bam', $data['Baz']);
+        $this->assertTrue(isset($data['Foo']), 'entries from the fallback locale are reported to be set...');
+        $this->assertNull($data['Foo'], '...but are always NULL. WTF.');
+        $this->assertFalse(isset($data['ExistsNot']));
+    }
+
+    public function testReadFollowsFallbackAlias()
+    {
+        // "mo" = "ro_MD" -> "ro"
+        $data = $this->reader->read(__DIR__.'/Fixtures/res', 'mo');
+
+        $this->assertInstanceOf('\ArrayAccess', $data);
+        $this->assertSame('Bam', $data['Baz'], 'data from the aliased locale can be accessed');
+        $this->assertTrue(isset($data['Foo']), 'entries from the fallback locale are reported to be set...');
+        $this->assertNull($data['Foo'], '...but are always NULL. WTF.');
+        $this->assertFalse(isset($data['ExistsNot']));
+    }
+
    /**
     * @expectedException \Symfony\Component\Intl\Exception\NoSuchLocaleException
     */
    public function testReadFailsIfNonExistingLocale()
    {
-        $this->reader->read(__DIR__.'/Fixtures', 'foo');
+        $this->reader->read(__DIR__.'/Fixtures/res', 'foo');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Intl\Exception\NoSuchLocaleException
+     */
+    public function testReadFailsIfNonExistingFallbackLocale()
+    {
+        $this->reader->read(__DIR__.'/Fixtures/res', 'ro_AT');
    }

    /**
     * @expectedException \Symfony\Component\Intl\Exception\RuntimeException
     */
    public function testReadFailsIfNonExistingDirectory()
    {
-        $this->reader->read(__DIR__.'/foo', 'en');
+        $this->reader->read(__DIR__.'/foo', 'ro');
    }
 }
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/build.sh b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -z "$ICU_BUILD_DIR" ]; then
+    echo "Please set the ICU_BUILD_DIR environment variable"
+    exit
+fi
+
+if [ ! -d "$ICU_BUILD_DIR" ]; then
+    echo "The directory $ICU_BUILD_DIR pointed at by ICU_BUILD_DIR does not exist"
+    exit
+fi
+
+DIR=`dirname $0`
+
+rm $DIR/res/*.res
+
+LD_LIBRARY_PATH=$ICU_BUILD_DIR/lib $ICU_BUILD_DIR/bin/genrb -d $DIR/res $DIR/txt/*.txt
diff --git a/...sts/ResourceBundle/Reader/Fixtures/en.php → ...ResourceBundle/Reader/Fixtures/php/en.php b/...sts/ResourceBundle/Reader/Fixtures/en.php → ...ResourceBundle/Reader/Fixtures/php/en.php
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/res/alias.res b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/res/alias.res
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/res/mo.res b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/res/mo.res
diff --git a/...sts/ResourceBundle/Reader/Fixtures/en.res → ...ResourceBundle/Reader/Fixtures/res/ro.res b/...sts/ResourceBundle/Reader/Fixtures/en.res → ...ResourceBundle/Reader/Fixtures/res/ro.res
diff --git a/...s/ResourceBundle/Reader/Fixtures/root.res → ...ourceBundle/Reader/Fixtures/res/ro_MD.res b/...s/ResourceBundle/Reader/Fixtures/root.res → ...ourceBundle/Reader/Fixtures/res/ro_MD.res
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/res/root.res b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/res/root.res
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/root.txt b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/root.txt
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/txt/alias.txt b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/txt/alias.txt
@@ -0,0 +1,3 @@
+alias{
+    "%%ALIAS"{"ro"}
+}
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/txt/mo.txt b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/txt/mo.txt
@@ -0,0 +1,3 @@
+mo{
+    "%%ALIAS"{"ro_MD"}
+}
diff --git a/...sts/ResourceBundle/Reader/Fixtures/en.txt → ...ResourceBundle/Reader/Fixtures/txt/ro.txt b/...sts/ResourceBundle/Reader/Fixtures/en.txt → ...ResourceBundle/Reader/Fixtures/txt/ro.txt
@@ -1,3 +1,3 @@
-en{
+ro{
    Foo{"Bar"}
 }
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/txt/ro_MD.txt b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/txt/ro_MD.txt
@@ -0,0 +1,3 @@
+ro_MD{
+    Baz{"Bam"}
+}
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/txt/root.txt b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/Fixtures/txt/root.txt
@@ -0,0 +1,6 @@
+root{
+    /**
+     * so genrb doesn't issue warnings
+     */
+    ___{""}
+}
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/PhpBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/PhpBundleReaderTest.php
@@ -30,7 +30,7 @@ protected function setUp()

    public function testReadReturnsArray()
    {
-        $data = $this->reader->read(__DIR__ . '/Fixtures', 'en');
+        $data = $this->reader->read(__DIR__ . '/Fixtures/php', 'en');

        $this->assertTrue(is_array($data));
        $this->assertSame('Bar', $data['Foo']);
@@ -42,7 +42,7 @@ public function testReadReturnsArray()
     */
    public function testReadFailsIfLocaleOtherThanEn()
    {
-        $this->reader->read(__DIR__ . '/Fixtures', 'foo');
+        $this->reader->read(__DIR__ . '/Fixtures/php', 'foo');
    }

    /**