Issue #1605332 by tim.plunkett: Fix fatals in language tests and move plugins.

8.0.x
Tim Plunkett 2012-08-27 09:50:27 +02:00
parent f3c1c1939f
commit 2f6501e4d1
8 changed files with 25 additions and 8 deletions

View File

@ -1,7 +1,8 @@
<?php <?php
/** /**
* @file * @file
* Definition of Drupal\views\Tests\Language\ArgumentLanguage.php * Definition of Drupal\views\Tests\Language\ArgumentLanguage.
*/ */
namespace Drupal\views\Tests\Language; namespace Drupal\views\Tests\Language;
@ -14,6 +15,7 @@ use Drupal\Core\Language\Language;
* @see Views\language\Plugin\views\argument\Language.php * @see Views\language\Plugin\views\argument\Language.php
*/ */
class ArgumentLanguage extends LanguageTestBase { class ArgumentLanguage extends LanguageTestBase {
public static function getInfo() { public static function getInfo() {
return array( return array(
'name' => 'Argument: Language', 'name' => 'Argument: Language',
@ -41,4 +43,5 @@ class ArgumentLanguage extends LanguageTestBase {
$view->destroy(); $view->destroy();
} }
} }
} }

View File

@ -1,7 +1,8 @@
<?php <?php
/** /**
* @file * @file
* Definition of Drupal\views\Tests\Language\FieldLanguage.php * Definition of Drupal\views\Tests\Language\FieldLanguage.
*/ */
namespace Drupal\views\Tests\Language; namespace Drupal\views\Tests\Language;
@ -14,11 +15,12 @@ use Drupal\Core\Language\Language;
* @see Views\language\Plugin\views\field\Language * @see Views\language\Plugin\views\field\Language
*/ */
class FieldLanguage extends LanguageTestBase { class FieldLanguage extends LanguageTestBase {
public static function getInfo() { public static function getInfo() {
return array( return array(
'name' => 'Field: Language', 'name' => 'Field: Language',
'description' => 'Tests the field language handler.', 'description' => 'Tests the field language handler.',
'group' => 'Views Handlers' 'group' => 'Views Handlers',
); );
} }
@ -36,4 +38,5 @@ class FieldLanguage extends LanguageTestBase {
$this->assertEqual($view->field['langcode']->advanced_render($view->result[0]), 'English'); $this->assertEqual($view->field['langcode']->advanced_render($view->result[0]), 'English');
$this->assertEqual($view->field['langcode']->advanced_render($view->result[1]), 'Lolspeak'); $this->assertEqual($view->field['langcode']->advanced_render($view->result[1]), 'Lolspeak');
} }
} }

View File

@ -1,7 +1,8 @@
<?php <?php
/** /**
* @file * @file
* Definition of Drupal\views\Tests\Language\FilterLanguage.php * Definition of Drupal\views\Tests\Language\FilterLanguage.
*/ */
namespace Drupal\views\Tests\Language; namespace Drupal\views\Tests\Language;
@ -14,6 +15,7 @@ use Drupal\Core\Language\Language;
* @see Views\language\Plugin\views\filter\Language * @see Views\language\Plugin\views\filter\Language
*/ */
class FilterLanguage extends LanguageTestBase { class FilterLanguage extends LanguageTestBase {
public static function getInfo() { public static function getInfo() {
return array( return array(
'name' => 'Filter: Language', 'name' => 'Filter: Language',
@ -42,4 +44,5 @@ class FilterLanguage extends LanguageTestBase {
$view->destroy(); $view->destroy();
} }
} }
} }

View File

@ -1,19 +1,26 @@
<?php <?php
/** /**
* @file * @file
* Definition of Drupal\views\Tests\Language\LanguageTestBase.php * Definition of Drupal\views\Tests\Language\LanguageTestBase.
*/ */
namespace Drupal\views\Tests\Language; namespace Drupal\views\Tests\Language;
use Drupal\views\Tests\ViewsSqlTest; use Drupal\views\Tests\ViewsSchemaTestBase;
use Drupal\Core\Language\Language; use Drupal\Core\Language\Language;
/** /**
* Base class for all Language handler tests. * Base class for all Language handler tests.
*/ */
abstract class LanguageTestBase extends ViewsSqlTest { abstract class LanguageTestBase extends ViewsSchemaTestBase {
public static $modules = array('views', 'language');
/**
* Modules to enable.
*
* @var array
*/
public static $modules = array('language');
protected function setUp() { protected function setUp() {
parent::setUp(); parent::setUp();
@ -64,4 +71,5 @@ abstract class LanguageTestBase extends ViewsSqlTest {
return $data; return $data;
} }
} }