From abfb638512e0a3e36f40f2e4db0e3913adc6ee35 Mon Sep 17 00:00:00 2001 From: M Parker Date: Wed, 25 Jun 2014 21:29:44 -0400 Subject: [PATCH] 2066557-15 --- .../modules/database_test/database_test.module | 137 ------------------- .../database_test/database_test.routing.yml | 10 +- .../Controller/DatabaseTestJsonController.php | 149 +++++++++++++++++++++ .../src/Controller/DatabaseTestController.php | 50 ------- 4 files changed, 154 insertions(+), 192 deletions(-) create mode 100644 core/modules/system/tests/modules/database_test/lib/Drupal/database_test/Controller/DatabaseTestJsonController.php delete mode 100644 core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php diff --git a/core/modules/system/tests/modules/database_test/database_test.module b/core/modules/system/tests/modules/database_test/database_test.module index cb9da23..86815d2 100644 --- a/core/modules/system/tests/modules/database_test/database_test.module +++ b/core/modules/system/tests/modules/database_test/database_test.module @@ -35,7 +35,6 @@ function database_test_query_alter(AlterableInterface $query) { } } - /** * Implements hook_query_TAG_alter(). * @@ -46,142 +45,6 @@ function database_test_query_database_test_alter_remove_range_alter(AlterableInt } /** - * Runs db_query_temporary() and outputs the table name and its number of rows. - * - * We need to test that the table created is temporary, so we run it here, in a - * separate menu callback request; After this request is done, the temporary - * table should automatically dropped. - * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::dbQueryTemporary() - */ -function database_test_db_query_temporary() { - $table_name = db_query_temporary('SELECT age FROM {test}', array()); - return new JsonResponse(array( - 'table_name' => $table_name, - 'row_count' => db_select($table_name)->countQuery()->execute()->fetchField(), - )); -} - -/** - * Runs a pager query and returns the results. - * - * This function does care about the page GET parameter, as set by the - * simpletest HTTP call. - * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::pagerQueryEven() - */ -function database_test_even_pager_query($limit) { - - $query = db_select('test', 't'); - $query - ->fields('t', array('name')) - ->orderBy('age'); - - // This should result in 2 pages of results. - $query = $query - ->extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->limit($limit); - - $names = $query->execute()->fetchCol(); - - return new JsonResponse(array( - 'names' => $names, - )); -} - -/** - * Runs a pager query and returns the results. - * - * This function does care about the page GET parameter, as set by the - * simpletest HTTP call. - * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::pagerQueryOdd() - */ -function database_test_odd_pager_query($limit) { - - $query = db_select('test_task', 't'); - $query - ->fields('t', array('task')) - ->orderBy('pid'); - - // This should result in 4 pages of results. - $query = $query - ->extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->limit($limit); - - $names = $query->execute()->fetchCol(); - - return new JsonResponse(array( - 'names' => $names, - )); -} - -/** - * Runs a tablesort query and returns the results. - * - * This function does care about the page GET parameter, as set by the - * simpletest HTTP call. - * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::testTablesort() - */ -function database_test_tablesort() { - $header = array( - 'tid' => array('data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'), - 'pid' => array('data' => t('Person ID'), 'field' => 'pid'), - 'task' => array('data' => t('Task'), 'field' => 'task'), - 'priority' => array('data' => t('Priority'), 'field' => 'priority', ), - ); - - $query = db_select('test_task', 't'); - $query - ->fields('t', array('tid', 'pid', 'task', 'priority')); - - $query = $query - ->extend('Drupal\Core\Database\Query\TableSortExtender') - ->orderByHeader($header); - - // We need all the results at once to check the sort. - $tasks = $query->execute()->fetchAll(); - - return new JsonResponse(array( - 'tasks' => $tasks, - )); -} - -/** - * Runs a tablesort query with a second order_by after and returns the results. - * - * This function does care about the page GET parameter, as set by the - * simpletest HTTP call. - * - * @deprecated \Drupal\database_test\Controller\DatabaseTestController::testTablesortFirst() - */ -function database_test_tablesort_first() { - $header = array( - 'tid' => array('data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'), - 'pid' => array('data' => t('Person ID'), 'field' => 'pid'), - 'task' => array('data' => t('Task'), 'field' => 'task'), - 'priority' => array('data' => t('Priority'), 'field' => 'priority', ), - ); - - $query = db_select('test_task', 't'); - $query - ->fields('t', array('tid', 'pid', 'task', 'priority')); - - $query = $query - ->extend('Drupal\Core\Database\Query\TableSortExtender') - ->orderByHeader($header) - ->orderBy('priority'); - - // We need all the results at once to check the sort. - $tasks = $query->execute()->fetchAll(); - - return new JsonResponse(array( - 'tasks' => $tasks, - )); -} - -/** * Outputs a form without setting a header sort. * * @deprecated \Drupal\database_test\Form\DatabaseTestForm::testTablesortDefaultSort() diff --git a/core/modules/system/tests/modules/database_test/database_test.routing.yml b/core/modules/system/tests/modules/database_test/database_test.routing.yml index a6ca5de..2e8aaa4 100644 --- a/core/modules/system/tests/modules/database_test/database_test.routing.yml +++ b/core/modules/system/tests/modules/database_test/database_test.routing.yml @@ -1,35 +1,35 @@ database_test.db_query_temporary: path: '/database_test/db_query_temporary' defaults: - _content: '\Drupal\database_test\Controller\DatabaseTestController::dbQueryTemporary' + _content: '\Drupal\database_test\Controller\DatabaseTestJsonController::dbQueryTemporary' requirements: _access: 'TRUE' database_test.pager_query_even: path: '/database_test/pager_query_even/{limit}' defaults: - _content: '\Drupal\database_test\Controller\DatabaseTestController::pagerQueryEven' + _content: '\Drupal\database_test\Controller\DatabaseTestJsonController::pagerQueryEven' requirements: _access: 'TRUE' database_test.pager_query_odd: path: '/database_test/pager_query_odd/{limit}' defaults: - _content: '\Drupal\database_test\Controller\DatabaseTestController::pagerQueryOdd' + _content: '\Drupal\database_test\Controller\DatabaseTestJsonController::pagerQueryOdd' requirements: _access: 'TRUE' database_test.tablesort: path: '/database_test/tablesort' defaults: - _content: '\Drupal\database_test\Controller\DatabaseTestController::testTablesort' + _content: '\Drupal\database_test\Controller\DatabaseTestJsonController::testTablesort' requirements: _access: 'TRUE' database_test.tablesort_first: path: '/database_test/tablesort_first' defaults: - _content: '\Drupal\database_test\Controller\DatabaseTestController::testTablesortFirst' + _content: '\Drupal\database_test\Controller\DatabaseTestJsonController::testTablesortFirst' requirements: _access: 'TRUE' diff --git a/core/modules/system/tests/modules/database_test/lib/Drupal/database_test/Controller/DatabaseTestJsonController.php b/core/modules/system/tests/modules/database_test/lib/Drupal/database_test/Controller/DatabaseTestJsonController.php new file mode 100644 index 0000000..cf5cd99 --- /dev/null +++ b/core/modules/system/tests/modules/database_test/lib/Drupal/database_test/Controller/DatabaseTestJsonController.php @@ -0,0 +1,149 @@ + $table_name, + 'row_count' => db_select($table_name)->countQuery()->execute()->fetchField(), + )); + } + + /** + * Runs a pager query and returns the results. + * + * This function does care about the page GET parameter, as set by the + * simpletest HTTP call. + */ + public function pagerQueryEven($limit) { + $query = db_select('test', 't'); + $query + ->fields('t', array('name')) + ->orderBy('age'); + + // This should result in 2 pages of results. + $query = $query + ->extend('Drupal\Core\Database\Query\PagerSelectExtender') + ->limit($limit); + + $result = $query->execute(); + + if ($result) { + $names = $result->fetchCol(); + return new JsonResponse(array( + 'names' => $names, + )); + } + else { + return new JsonResponse(); + } + } + + /** + * Runs a pager query and returns the results. + * + * This function does care about the page GET parameter, as set by the + * simpletest HTTP call. + */ + public function pagerQueryOdd($limit) { + $query = db_select('test_task', 't'); + $query + ->fields('t', array('task')) + ->orderBy('pid'); + // This should result in 4 pages of results. + $query = $query + ->extend('Drupal\Core\Database\Query\PagerSelectExtender') + ->limit($limit); + + $result = $query->execute(); + + if ($result) { + $names = $result->fetchCol(); + return new JsonResponse(array( + 'names' => $names, + )); + } + else { + return new JsonResponse(); + } + } + + /** + * Runs a tablesort query and returns the results. + * + * This function does care about the page GET parameter, as set by the + * simpletest HTTP call. + */ + public function testTablesort() { + $header = array( + 'tid' => array('data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'), + 'pid' => array('data' => t('Person ID'), 'field' => 'pid'), + 'task' => array('data' => t('Task'), 'field' => 'task'), + 'priority' => array('data' => t('Priority'), 'field' => 'priority', ), + ); + + $query = db_select('test_task', 't'); + $query + ->fields('t', array('tid', 'pid', 'task', 'priority')); + + $query = $query + ->extend('Drupal\Core\Database\Query\TableSortExtender') + ->orderByHeader($header); + + // We need all the results at once to check the sort. + $tasks = $query->execute()->fetchAll(); + + return new JsonResponse(array( + 'tasks' => $tasks, + )); + } + + /** + * Runs a tablesort query with a second order_by after and returns the results. + * + * This function does care about the page GET parameter, as set by the + * simpletest HTTP call. + */ + public function testTablesortFirst() { + $header = array( + 'tid' => array('data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'), + 'pid' => array('data' => t('Person ID'), 'field' => 'pid'), + 'task' => array('data' => t('Task'), 'field' => 'task'), + 'priority' => array('data' => t('Priority'), 'field' => 'priority', ), + ); + + $query = db_select('test_task', 't'); + $query + ->fields('t', array('tid', 'pid', 'task', 'priority')); + + $query = $query + ->extend('Drupal\Core\Database\Query\TableSortExtender') + ->orderByHeader($header) + ->orderBy('priority'); + + // We need all the results at once to check the sort. + $tasks = $query->execute()->fetchAll(); + + return new JsonResponse(array( + 'tasks' => $tasks, + )); + } + +} diff --git a/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php b/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php deleted file mode 100644 index 23687d3..0000000 --- a/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php +++ /dev/null @@ -1,50 +0,0 @@ -