Merge pull request #972 from virtualtam/travis/trusty

Travis: switch to Ubuntu Trusty build environment

diff --git a/.travis.yml b/.travis.yml
index 26535ad34f66fbdb68adb9446ad386ee057b3707..b6b9bddf60d0595dae6069fd33cf8ad166c5cee5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,6 @@
 sudo: false
-dist: precise
+dist: trusty
 language: php
-addons:
-  apt:
-    packages:
-      - locales
-      - language-pack-de
-      - language-pack-fr
 cache:
   directories:
     - $HOME/.composer/cache
@@ -18,6 +12,7 @@ php:
 install:
   - composer self-update
   - composer install --prefer-dist
+  - locale -a
 script:
   - make clean
   - make check_permissions

diff --git a/tests/languages/de/UtilsDeTest.php b/tests/languages/de/UtilsDeTest.php
index 6c9c9adce8cb6b02653bf32b4660f5f69c04edd5..4569c923b3171609d8a755cd32aa4cdf06c755a2 100644 (file)
--- a/tests/languages/de/UtilsDeTest.php
+++ b/tests/languages/de/UtilsDeTest.php
@@ -81,12 +81,12 @@ class UtilsDeTest extends UtilsTest
     }
 
     /**
-     * Test autoLocale with multiples value, the second one is valid
+     * Test autoLocale with multiples value, the second one is available
      */
-    public function testAutoLocaleMultipleSecondValid()
+    public function testAutoLocaleMultipleSecondAvailable()
     {
         $current = setlocale(LC_ALL, 0);
-        $header = 'pt_BR,fr-fr';
+        $header = 'mag_IN,fr-fr';
         autoLocale($header);
         $this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0));
 
@@ -106,12 +106,12 @@ class UtilsDeTest extends UtilsTest
     }
 
     /**
-     * Test autoLocale with an invalid value: defaults to en_US.
+     * Test autoLocale with an unavailable value: defaults to en_US.
      */
-    public function testAutoLocaleInvalid()
+    public function testAutoLocaleUnavailable()
     {
         $current = setlocale(LC_ALL, 0);
-        autoLocale('pt_BR');
+        autoLocale('mag_IN');
         $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0));
 
         setlocale(LC_ALL, $current);

diff --git a/tests/languages/en/UtilsEnTest.php b/tests/languages/en/UtilsEnTest.php
index d8680b2b429c1ae6ab4b1f0f888e61c5d3faf4a4..a74063ae92de8fdd41c65727f64c8e071b0bfebd 100644 (file)
--- a/tests/languages/en/UtilsEnTest.php
+++ b/tests/languages/en/UtilsEnTest.php
@@ -81,12 +81,12 @@ class UtilsEnTest extends UtilsTest
     }
 
     /**
-     * Test autoLocale with multiples value, the second one is valid
+     * Test autoLocale with multiples value, the second one is available
      */
-    public function testAutoLocaleMultipleSecondValid()
+    public function testAutoLocaleMultipleSecondAvailable()
     {
         $current = setlocale(LC_ALL, 0);
-        $header = 'pt_BR,fr-fr';
+        $header = 'mag_IN,fr-fr';
         autoLocale($header);
         $this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0));
 
@@ -106,12 +106,12 @@ class UtilsEnTest extends UtilsTest
     }
 
     /**
-     * Test autoLocale with an invalid value: defaults to en_US.
+     * Test autoLocale with an unavailable value: defaults to en_US.
      */
-    public function testAutoLocaleInvalid()
+    public function testAutoLocaleUnavailable()
     {
         $current = setlocale(LC_ALL, 0);
-        autoLocale('pt_BR');
+        autoLocale('mag_IN');
         $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0));
 
         setlocale(LC_ALL, $current);

diff --git a/tests/languages/fr/UtilsFrTest.php b/tests/languages/fr/UtilsFrTest.php
index 0d50a87829f241591b0868446831c2918dcd4618..3dbb126faef25b2b82b6d7bf4571eff124ec98d1 100644 (file)
--- a/tests/languages/fr/UtilsFrTest.php
+++ b/tests/languages/fr/UtilsFrTest.php
@@ -81,12 +81,12 @@ class UtilsFrTest extends UtilsTest
     }
 
     /**
-     * Test autoLocale with multiples value, the second one is valid
+     * Test autoLocale with multiples value, the second one is available
      */
-    public function testAutoLocaleMultipleSecondValid()
+    public function testAutoLocaleMultipleSecondAvailable()
     {
         $current = setlocale(LC_ALL, 0);
-        $header = 'pt_BR,de-de';
+        $header = 'mag_IN,de-de';
         autoLocale($header);
         $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0));
 
@@ -106,12 +106,12 @@ class UtilsFrTest extends UtilsTest
     }
 
     /**
-     * Test autoLocale with an invalid value: defaults to en_US.
+     * Test autoLocale with an unavailable value: defaults to en_US.
      */
-    public function testAutoLocaleInvalid()
+    public function testAutoLocaleUnavailable()
     {
         $current = setlocale(LC_ALL, 0);
-        autoLocale('pt_BR');
+        autoLocale('mag_IN');
         $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0));
 
         setlocale(LC_ALL, $current);