From 2ae8fde2d352882fd90c7ea1a5ac7aac3405aab8 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 27 Apr 2017 16:54:42 +1200
Subject: [PATCH] Fix tests

---
 tests/php/i18n/i18nTest.php                | 18 +++++++++---------
 tests/php/i18n/i18nTest/TestDataObject.php |  2 +-
 tests/php/i18n/i18nTest/TestObject.php     |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/php/i18n/i18nTest.php b/tests/php/i18n/i18nTest.php
index 0cd2c9703..cc16807a2 100644
--- a/tests/php/i18n/i18nTest.php
+++ b/tests/php/i18n/i18nTest.php
@@ -81,29 +81,29 @@ class i18nTest extends SapphireTest
         $provider = Injector::inst()->get(MessageProvider::class);
         $provider->getTranslator()->addResource(
             'array',
-            [ 'i18nTest_DataObject.MyProperty' => 'MyProperty' ],
+            [ i18nTest\TestDataObject::class.'.MyProperty' => 'MyProperty' ],
             'en_US'
         );
         $provider->getTranslator()->addResource(
             'array',
-            [ 'i18nTest_DataObject.MyProperty' => 'Mein Attribut' ],
+            [ i18nTest\TestDataObject::class.'.MyProperty' => 'Mein Attribut' ],
             'de_DE'
         );
         $provider->getTranslator()->addResource(
             'array',
-            [ 'i18nTest_DataObject.MyUntranslatedProperty' => 'Mein Attribut' ],
+            [ i18nTest\TestDataObject::class.'.MyUntranslatedProperty' => 'Mein Attribut' ],
             'en_US'
         );
 
         // Test field labels
         $obj = new i18nTest\TestDataObject();
         $this->assertEquals(
-            $obj->fieldLabel('MyProperty'),
-            'Mein Attribut'
+            'Mein Attribut',
+            $obj->fieldLabel('MyProperty')
         );
         $this->assertEquals(
-            $obj->fieldLabel('MyUntranslatedProperty'),
-            'My Untranslated Property'
+            'My Untranslated Property',
+            $obj->fieldLabel('MyUntranslatedProperty')
         );
     }
 
@@ -113,12 +113,12 @@ class i18nTest extends SapphireTest
         $provider = Injector::inst()->get(MessageProvider::class);
         $provider->getTranslator()->addResource(
             'array',
-            [ 'i18nTest_Object.MyProperty' => 'Untranslated' ],
+            [ i18nTest\TestObject::class.'.MyProperty' => 'Untranslated' ],
             'en_US'
         );
         $provider->getTranslator()->addResource(
             'array',
-            [ 'i18nTest_Object.my_translatable_property' => 'Übersetzt' ],
+            [ i18nTest\TestObject::class.'.my_translatable_property' => 'Übersetzt' ],
             'de_DE'
         );
 
diff --git a/tests/php/i18n/i18nTest/TestDataObject.php b/tests/php/i18n/i18nTest/TestDataObject.php
index ca124530b..69145034b 100644
--- a/tests/php/i18n/i18nTest/TestDataObject.php
+++ b/tests/php/i18n/i18nTest/TestDataObject.php
@@ -34,7 +34,7 @@ class TestDataObject extends DataObject implements TestOnly
     public function fieldLabels($includerelations = true)
     {
         $labels = parent::fieldLabels($includerelations);
-        $labels['MyProperty'] = _t('SilverStripe\\i18n\\Tests\\i18Test\\TestDataObject.MyProperty', 'My Property');
+        $labels['MyProperty'] = _t(__CLASS__.'.MyProperty', 'My Property');
 
         return $labels;
     }
diff --git a/tests/php/i18n/i18nTest/TestObject.php b/tests/php/i18n/i18nTest/TestObject.php
index 194dd9141..3b214f64e 100644
--- a/tests/php/i18n/i18nTest/TestObject.php
+++ b/tests/php/i18n/i18nTest/TestObject.php
@@ -11,13 +11,13 @@ class TestObject implements TestOnly, i18nEntityProvider
 
     public static function my_translatable_property()
     {
-        return _t("SilverStripe\\i18n\\Tests\\i18Test\\TestObject.my_translatable_property", self::$my_translatable_property);
+        return _t(__CLASS__.".my_translatable_property", self::$my_translatable_property);
     }
 
     public function provideI18nEntities()
     {
         return [
-            "i18nTest_Object.my_translatable_property" => self::$my_translatable_property,
+            __CLASS__.".my_translatable_property" => self::$my_translatable_property,
         ];
     }
 }