The data type of a field determines how it can be used for searching and filtering. The boost is used to give additional weight to certain fields, e.g. titles or tags.
Whether detailed field types are supported depends on the type of server this index resides on. In any case, fields of type "Fulltext" will always be fulltext-searchable.
'); if ($index->hasValidServer()) { $form['description']['#markup'] .= '' . $this->t('Check the ' . "server's backend class description for details.", - array(':server-url' => $index->getServer()->toUrl('canonical')->toString())) . '
'; + array(':server-url' => $index->getServerInstance()->toUrl('canonical')->toString())) . ''; } if ($fields = $index->getFieldsByDatasource(NULL)) { diff --git a/src/Form/IndexForm.php b/src/Form/IndexForm.php index 2bfca64..1db8781 100644 --- a/src/Form/IndexForm.php +++ b/src/Form/IndexForm.php @@ -262,7 +262,7 @@ class IndexForm extends EntityForm { '#title' => $this->t('Tracker'), '#description' => $this->t('Select the type of tracker which should be used for keeping track of item changes.'), '#options' => $this->getTrackerPluginManager()->getOptionsList(), - '#default_value' => $index->hasValidTracker() ? $index->getTracker()->getPluginId() : key($tracker_options), + '#default_value' => $index->hasValidTracker() ? $index->getTrackerInstance()->getPluginId() : key($tracker_options), '#required' => TRUE, '#disabled' => !$index->isNew(), '#ajax' => array( @@ -313,7 +313,7 @@ class IndexForm extends EntityForm { '#description' => $this->t('Only enabled indexes can be used for indexing and searching. This setting will only take effect if the selected server is also enabled.'), '#default_value' => $index->status(), // Can't enable an index lying on a disabled server or no server at all. - '#disabled' => !$index->status() && (!$index->hasValidServer() || !$index->getServer()->status()), + '#disabled' => !$index->status() && (!$index->hasValidServer() || !$index->getServerInstance()->status()), // @todo This doesn't seem to work and should also hide for disabled // servers. If that works, we can probably remove the last sentence of // the description. @@ -392,7 +392,7 @@ class IndexForm extends EntityForm { */ public function buildTrackerConfigForm(array &$form, FormStateInterface $form_state, IndexInterface $index) { if ($index->hasValidTracker()) { - $tracker = $index->getTracker(); + $tracker = $index->getTrackerInstance(); // @todo Create, use and save SubFormState already here, not only in // validate(). Also, use proper subset of $form for first parameter? if ($config_form = $tracker->buildConfigurationForm(array(), $form_state)) { @@ -484,7 +484,7 @@ class IndexForm extends EntityForm { // form structure). $tracker_id = $form_state->getValue('tracker', NULL); if ($this->originalEntity->getTrackerId() == $tracker_id) { - $tracker = $this->originalEntity->getTracker(); + $tracker = $this->originalEntity->getTrackerInstance(); } else { $tracker = $this->trackerPluginManager->createInstance($tracker_id, array('index' => $this->originalEntity)); @@ -526,15 +526,17 @@ class IndexForm extends EntityForm { $datasources = $form_state->getValue('datasources', array()); /** @var \Drupal\search_api\Datasource\DatasourceInterface[] $datasource_plugins */ $datasource_plugins = $this->originalEntity->getDatasources(FALSE); - $datasource_configuration = array(); + $datasource_settings = array(); foreach ($datasources as $datasource_id) { $datasource = $datasource_plugins[$datasource_id]; $datasource_form = (!empty($form['datasource_configs'][$datasource_id])) ? $form['datasource_configs'][$datasource_id] : array(); $datasource_form_state = new SubFormState($form_state, array('datasource_configs', $datasource_id)); $datasource->submitConfigurationForm($datasource_form, $datasource_form_state); - $datasource_configuration[$datasource_id] = $datasource->getConfiguration(); + + $datasource_settings[$datasource_id]['plugin_id'] = $datasource_id; + $datasource_settings[$datasource_id]['settings'] = $datasource->getConfiguration(); } - $index->set('datasource_configs', $datasource_configuration); + $index->set('datasource_settings', $datasource_settings); // Call submitConfigurationForm() for the (possibly new) tracker. // @todo It seems if we change the tracker, we would validate/submit the old @@ -544,7 +546,7 @@ class IndexForm extends EntityForm { // form structure). $tracker_id = $form_state->getValue('tracker', NULL); if ($this->originalEntity->getTrackerId() == $tracker_id) { - $tracker = $this->originalEntity->getTracker(); + $tracker = $this->originalEntity->getTrackerInstance(); } else { $tracker = $this->trackerPluginManager->createInstance($tracker_id, array('index' => $this->originalEntity)); @@ -552,7 +554,12 @@ class IndexForm extends EntityForm { $tracker_form_state = new SubFormState($form_state, array('tracker_config')); $tracker->submitConfigurationForm($form['tracker_config'], $tracker_form_state); - $index->set('tracker_config', $tracker->getConfiguration()); + $index->set('tracker_settings', array( + $tracker_id => array( + 'plugin_id' => $tracker_id, + 'settings' => $tracker->getConfiguration(), + ) + )); } /** diff --git a/src/Form/IndexProcessorsForm.php b/src/Form/IndexProcessorsForm.php index d32e5ac..30caed6 100644 --- a/src/Form/IndexProcessorsForm.php +++ b/src/Form/IndexProcessorsForm.php @@ -96,8 +96,8 @@ class IndexProcessorsForm extends EntityForm { $processors_by_stage[$stage] = $this->entity->getProcessorsByStage($stage, FALSE); } - if ($this->entity->getServer()) { - $backend_discouraged_processors = $this->entity->getServer() + if ($this->entity->getServerInstance()) { + $backend_discouraged_processors = $this->entity->getServerInstance() ->getBackend() ->getDiscouragedProcessors(); @@ -112,7 +112,7 @@ class IndexProcessorsForm extends EntityForm { } } - $processor_settings = $this->entity->getProcessorSettings(); + $enabled_processors = $this->entity->getProcessors(); $form['#tree'] = TRUE; $form['#attached']['library'][] = 'search_api/drupal.search_api.index-active-formatters'; @@ -132,7 +132,7 @@ class IndexProcessorsForm extends EntityForm { $form['status'][$processor_id] = array( '#type' => 'checkbox', '#title' => $processor->label(), - '#default_value' => $processor->isLocked() || !empty($processor_settings[$processor_id]), + '#default_value' => $processor->isLocked() || !empty($enabled_processors[$processor_id]), '#description' => $processor->getDescription(), '#attributes' => array( 'class' => array( @@ -171,9 +171,7 @@ class IndexProcessorsForm extends EntityForm { foreach ($processors_by_stage as $stage => $processors) { /** @var \Drupal\search_api\Processor\ProcessorInterface $processor */ foreach ($processors as $processor_id => $processor) { - $weight = isset($processor_settings[$processor_id]['weights'][$stage]) - ? $processor_settings[$processor_id]['weights'][$stage] - : $processor->getDefaultWeight($stage); + $weight = $processor->getDefaultWeight($stage); if ($processor->isHidden()) { $form['processors'][$processor_id]['weights'][$stage] = array( '#type' => 'value', @@ -252,9 +250,13 @@ class IndexProcessorsForm extends EntityForm { $values = $form_state->getValues(); $new_settings = array(); + $old_processors = $this->entity->getProcessors(); + $old_configurations = array(); + foreach ($old_processors as $id => $processor) { + $old_configurations[$id] = $processor->getConfiguration(); + } + // Store processor settings. - // @todo Go through all available processors, enable/disable with method on - // processor plugin to allow reaction. /** @var \Drupal\search_api\Processor\ProcessorInterface $processor */ $processors = $this->entity->getProcessors(FALSE); foreach ($processors as $processor_id => $processor) { @@ -262,27 +264,33 @@ class IndexProcessorsForm extends EntityForm { continue; } $new_settings[$processor_id] = array( - 'processor_id' => $processor_id, - 'weights' => array(), + 'plugin_id' => $processor_id, 'settings' => array(), ); $processor_values = $values['processors'][$processor_id]; - if (!empty($processor_values['weights'])) { - $new_settings[$processor_id]['weights'] = $processor_values['weights']; - } if (isset($form['settings'][$processor_id])) { $processor_form_state = new SubFormState($form_state, array('processors', $processor_id, 'settings')); $processor->submitConfigurationForm($form['settings'][$processor_id], $processor_form_state); $new_settings[$processor_id]['settings'] = $processor->getConfiguration(); } + if (!empty($processor_values['weights'])) { + $new_settings[$processor_id]['settings']['weights'] = $processor_values['weights']; + } + } + + $new_configurations = array(); + foreach ($new_settings as $plugin_id => $new_processor_settings) { + /** @var \Drupal\search_api\Processor\ProcessorInterface $new_processor */ + $new_processor = $this->processorPluginManager->createInstance($plugin_id, $new_processor_settings['settings']); + if (isset($old_processors[$plugin_id])) { + $this->entity->removeProcessor($plugin_id); + } + $this->entity->addProcessor($new_processor); + $new_configurations[$plugin_id] = $new_processor->getConfiguration(); } - // Sort the processors so we won't have unnecessary changes. - ksort($new_settings); - $settings_changed = $new_settings != $this->entity->getProcessorSettings(); - $form_state->set('processors_changed', $settings_changed); - if ($settings_changed) { - $this->entity->setProcessorSettings($new_settings); + if ($old_configurations != $new_configurations) { + $form_state->set('processors_changed', TRUE); } } diff --git a/src/Form/IndexStatusForm.php b/src/Form/IndexStatusForm.php index 640e795..ad42155 100644 --- a/src/Form/IndexStatusForm.php +++ b/src/Form/IndexStatusForm.php @@ -65,7 +65,7 @@ class IndexStatusForm extends FormBase { 'class' => array('container-inline'), ), ); - $has_remaining_items = ($index->getTracker()->getRemainingItemsCount() > 0); + $has_remaining_items = ($index->getTrackerInstance()->getRemainingItemsCount() > 0); $all_value = $this->t('all', array(), array('context' => 'items to index')); $limit = array( '#type' => 'textfield', diff --git a/src/IndexBatchHelper.php b/src/IndexBatchHelper.php index 56c4d3b..144817d 100644 --- a/src/IndexBatchHelper.php +++ b/src/IndexBatchHelper.php @@ -137,7 +137,7 @@ class IndexBatchHelper { // Get the remaining item count. When no valid tracker is available then // the value will be set to zero which will cause the batch process to // stop. - $remaining_item_count = ($index->hasValidTracker() ? $index->getTracker()->getRemainingItemsCount() : 0); + $remaining_item_count = ($index->hasValidTracker() ? $index->getTrackerInstance()->getRemainingItemsCount() : 0); // Check if an explicit limit needs to be used. if ($context['sandbox']['limit'] > -1) { diff --git a/src/IndexInterface.php b/src/IndexInterface.php index a435f35..85570ae 100644 --- a/src/IndexInterface.php +++ b/src/IndexInterface.php @@ -9,6 +9,7 @@ namespace Drupal\search_api; use Drupal\Core\Config\Entity\ConfigEntityInterface; use Drupal\search_api\Item\FieldInterface; +use Drupal\search_api\Processor\ProcessorInterface; use Drupal\search_api\Query\QueryInterface; use Drupal\search_api\Query\ResultSetInterface; @@ -200,7 +201,7 @@ interface IndexInterface extends ConfigEntityInterface { * @throws \Drupal\search_api\SearchApiException * Thrown if the tracker couldn't be instantiated. */ - public function getTracker(); + public function getTrackerInstance(); /** * Determines whether this index is lying on a valid server. @@ -236,7 +237,7 @@ interface IndexInterface extends ConfigEntityInterface { * @throws \Drupal\search_api\SearchApiException * Thrown if the server couldn't be loaded. */ - public function getServer(); + public function getServerInstance(); /** * Sets the server the index is attached to @@ -277,22 +278,24 @@ interface IndexInterface extends ConfigEntityInterface { public function getProcessorsByStage($stage, $only_enabled = TRUE); /** - * Retrieves this index's processor settings. + * Adds a processor to this index. * - * @return array - * An array of processors and their settings. + * @param \Drupal\search_api\Processor\ProcessorInterface $processor + * The processor to be added. + * + * @return $this */ - public function getProcessorSettings(); + public function addProcessor(ProcessorInterface $processor); /** - * Sets this index's processor settings. + * Removes a processor from this index. * - * @param array $processors - * An array of processors and their settings. + * @param string $processor_id + * The ID of the processor to remove. * * @return $this */ - public function setProcessorSettings(array $processors); + public function removeProcessor($processor_id); /** * Preprocesses data items for indexing. @@ -420,24 +423,6 @@ interface IndexInterface extends ConfigEntityInterface { public function getFulltextFields(); /** - * Retrieves this index's field settings. - * - * @return array - * An array of field settings. - */ - public function getFieldSettings(); - - /** - * Sets this index's field settings. - * - * @param array $fields - * An array of field settings. - * - * @return $this - */ - public function setFieldSettings(array $fields); - - /** * Retrieves the properties of one of this index's datasources. * * @param string|null $datasource_id @@ -591,15 +576,6 @@ interface IndexInterface extends ConfigEntityInterface { public function isReindexing(); /** - * Resets the static and stored caches associated with this index. - * - * @param bool $include_stored - * (optional) If set to FALSE, only the static caches will be cleared, the - * stored cache will remain untouched. - */ - public function resetCaches($include_stored = TRUE); - - /** * Creates a query object for this index. * * @param array $options diff --git a/src/Item/Field.php b/src/Item/Field.php index 8580c59..2d14eb4 100644 --- a/src/Item/Field.php +++ b/src/Item/Field.php @@ -167,7 +167,7 @@ class Field implements \IteratorAggregate, FieldInterface { * {@inheritdoc} */ public function setIndex(IndexInterface $index) { - if ($this->index->id() != $index->id()) { + if ($this->index instanceof IndexInterface && $this->index->id() != $index->id()) { throw new \InvalidArgumentException('Attempted to change the index of a field object.'); } $this->index = $index; diff --git a/src/Plugin/search_api/datasource/ContentEntity.php b/src/Plugin/search_api/datasource/ContentEntity.php index 570085c..8116722 100644 --- a/src/Plugin/search_api/datasource/ContentEntity.php +++ b/src/Plugin/search_api/datasource/ContentEntity.php @@ -940,7 +940,7 @@ class ContentEntity extends DatasourcePluginBase { $entity_bundle = $entity->bundle(); $index_names = \Drupal::entityQuery('search_api_index') - ->condition('datasources.*', $datasource_id) + ->condition('datasource_settings.*.plugin_id', $datasource_id) ->execute(); if (!$index_names) { diff --git a/src/Plugin/views/argument/SearchApiMoreLikeThis.php b/src/Plugin/views/argument/SearchApiMoreLikeThis.php index f39c8b0..bfe03e3 100644 --- a/src/Plugin/views/argument/SearchApiMoreLikeThis.php +++ b/src/Plugin/views/argument/SearchApiMoreLikeThis.php @@ -69,7 +69,7 @@ class SearchApiMoreLikeThis extends SearchApiArgument { */ public function query($group_by = FALSE) { try { - $server = $this->query->getIndex()->getServer(); + $server = $this->query->getIndex()->getServerInstance(); if (!$server->supportsFeature('search_api_mlt')) { $backend_id = $server->getBackendId(); \Drupal::logger('search_api')->error('The search backend "@backend_id" does not offer "More like this" functionality.', diff --git a/src/Query/Query.php b/src/Query/Query.php index eb22371..53bbe60 100644 --- a/src/Query/Query.php +++ b/src/Query/Query.php @@ -318,7 +318,7 @@ class Query implements QueryInterface { $this->preExecute(); // Execute query. - $response = $this->index->getServer()->search($this); + $response = $this->index->getServerInstance()->search($this); // Postprocess the search results. $this->postExecute($response); diff --git a/src/Task/IndexTaskManager.php b/src/Task/IndexTaskManager.php index db1b5b8..4cfafcb 100644 --- a/src/Task/IndexTaskManager.php +++ b/src/Task/IndexTaskManager.php @@ -99,7 +99,7 @@ class IndexTaskManager implements IndexTaskManagerInterface { $item_ids[] = Utility::createCombinedId($datasource_id, $raw_id); } $added = count($item_ids); - $index->getTracker()->trackItemsInserted($item_ids); + $index->getTrackerInstance()->trackItemsInserted($item_ids); } } } @@ -195,7 +195,7 @@ class IndexTaskManager implements IndexTaskManagerInterface { if (!isset($datasource_ids)) { $this->state->delete($this->getIndexStateKey($index)); if ($valid_tracker) { - $index->getTracker()->trackAllItemsDeleted(); + $index->getTrackerInstance()->trackAllItemsDeleted(); } return; } @@ -211,7 +211,7 @@ class IndexTaskManager implements IndexTaskManagerInterface { foreach ($datasource_ids as $datasource_id) { unset($index_state['pages'][$datasource_id]); if ($valid_tracker) { - $index->getTracker()->trackAllItemsDeleted($datasource_id); + $index->getTrackerInstance()->trackAllItemsDeleted($datasource_id); } } diff --git a/src/Tests/IntegrationTest.php b/src/Tests/IntegrationTest.php index a14f24d..9ea4230 100644 --- a/src/Tests/IntegrationTest.php +++ b/src/Tests/IntegrationTest.php @@ -98,6 +98,53 @@ class IntegrationTest extends WebTestBase { } /** + * Tests what happens when an index has an integer as id/label. + * + * This needs to be in a separate index because we also want to see what + * happens with the content and we don't want to mess with the content entity + * tracking of the other index. + */ + public function testIntegerIndex() { + $this->drupalLogin($this->adminUser); + $this->getTestServer(); + + $this->drupalCreateNode(array('type' => 'article')); + $this->drupalCreateNode(array('type' => 'article')); + + $this->drupalGet('admin/config/search/search-api/add-index'); + + $this->indexId = 123; + $edit = array( + 'name' => $this->indexId, + 'id' => $this->indexId, + 'status' => 1, + 'description' => 'test Index:: 123~', + 'server' => 'webtest_server', + 'datasources[]' => array('entity:node'), + ); + $this->drupalPostForm(NULL, $edit, $this->t('Save')); + $this->assertText($this->t('The index was successfully saved.')); + $this->assertText($this->t('Successfully tracked @count items for this index.', array('@count' => 2))); + $this->assertEqual(2, $this->countTrackedItems()); + + $this->enableAllProcessors(); + $this->checkFieldLabels(); + + $this->addFieldsToIndex(); + $this->removeFieldsFromIndex(); + + $this->configureFilter(); + $this->configureFilterPage(); + $this->checkProcessorChanges(); + $this->changeProcessorFieldBoost(); + + $this->setReadOnly(); + $this->disableEnableIndex(); + $this->changeIndexDatasource(); + $this->changeIndexServer(); + } + + /** * Tests creating a search server via the UI. */ protected function createServer($server_id = '_test_server') { @@ -382,7 +429,7 @@ class IntegrationTest extends WebTestBase { * The number of tracked items in the test index. */ protected function countTrackedItems() { - return $this->getIndex()->getTracker()->getTotalItemsCount(); + return $this->getIndex()->getTrackerInstance()->getTotalItemsCount(); } /** @@ -392,7 +439,7 @@ class IntegrationTest extends WebTestBase { * The number of unindexed items in the test index. */ protected function countRemainingItems() { - return $this->getIndex()->getTracker()->getRemainingItemsCount(); + return $this->getIndex()->getTrackerInstance()->getRemainingItemsCount(); } /** @@ -454,10 +501,6 @@ class IntegrationTest extends WebTestBase { $this->drupalPostForm(NULL, $edit, $this->t('Save and continue')); $this->drupalPostForm(NULL, array(), $this->t('Save field settings')); - // @todo This should not be necessary, the field cache should be invalidated - // automatically when available fields change. See #2637032. - $this->getIndex()->resetCaches(); - $url_options['query']['datasource'] = 'entity:node'; $this->drupalGet($this->getIndexPath('fields/add'), $url_options); $this->assertHtmlEscaped($field_name); @@ -723,7 +766,7 @@ class IntegrationTest extends WebTestBase { $this->drupalPostForm($index_path, array(), $this->t('Index now')); - $remaining_after = $index->getTracker()->getRemainingItemsCount(); + $remaining_after = $index->getTrackerInstance()->getRemainingItemsCount(); $this->assertEqual(0, $remaining_after, 'Items were indexed after removing the "read only" flag.'); } diff --git a/src/Tests/LanguageIntegrationTest.php b/src/Tests/LanguageIntegrationTest.php index 92c88df..5a4a428 100644 --- a/src/Tests/LanguageIntegrationTest.php +++ b/src/Tests/LanguageIntegrationTest.php @@ -120,6 +120,6 @@ class LanguageIntegrationTest extends WebTestBase { protected function countTrackedItems() { /** @var \Drupal\search_api\IndexInterface $index */ $index = Index::load($this->indexId); - return $index->getTracker()->getTotalItemsCount(); + return $index->getTrackerInstance()->getTotalItemsCount(); } } diff --git a/src/Tests/Processor/ContentAccessTest.php b/src/Tests/Processor/ContentAccessTest.php index b301cd4..b0320b9 100644 --- a/src/Tests/Processor/ContentAccessTest.php +++ b/src/Tests/Processor/ContentAccessTest.php @@ -109,7 +109,23 @@ class ContentAccessTest extends ProcessorTestBase { $this->nodes[2]->save(); // Also index users, to verify that they are unaffected by the processor. - $this->index->set('datasources', array('entity:comment', 'entity:node', 'entity:user')); + $this->index->set( + 'datasource_settings', + array( + 'entity:comment' => array( + 'plugin_id' => 'entity:comment', + 'settings' => array(), + ), + 'entity:node' => array( + 'plugin_id' => 'entity:node', + 'settings' => array(), + ), + 'entity:user' => array( + 'plugin_id' => 'entity:user', + 'settings' => array(), + ), + ) + ); $this->index->save(); \Drupal::getContainer()->get('search_api.index_task_manager')->addItemsAll($this->index); @@ -125,6 +141,8 @@ class ContentAccessTest extends ProcessorTestBase { user_role_grant_permissions('anonymous', array('access content', 'access comments')); $this->index->reindex(); $this->index->indexItems(); + $this->assertEqual(5, $this->index->getTrackerInstance()->getIndexedItemsCount(), '5 items indexed, as expected.'); + $query = Utility::createQuery($this->index); $result = $query->execute(); @@ -138,6 +156,8 @@ class ContentAccessTest extends ProcessorTestBase { user_role_grant_permissions('anonymous', array('access comments')); $this->index->reindex(); $this->index->indexItems(); + $this->assertEqual(5, $this->index->getTrackerInstance()->getIndexedItemsCount(), '5 items indexed, as expected.'); + $query = Utility::createQuery($this->index); $result = $query->execute(); @@ -154,6 +174,7 @@ class ContentAccessTest extends ProcessorTestBase { $this->nodes[3] = Node::create(array('status' => NODE_NOT_PUBLISHED, 'type' => 'page', 'title' => 'foo', 'uid' => 2)); $this->nodes[3]->save(); $this->index->indexItems(); + $this->assertEqual(7, $this->index->getTrackerInstance()->getIndexedItemsCount(), '7 items indexed, as expected.'); $query = Utility::createQuery($this->index); $query->setOption('search_api_access_account', $authenticated_user); diff --git a/src/Tests/Processor/ProcessorIntegrationTest.php b/src/Tests/Processor/ProcessorIntegrationTest.php index ad617c8..b2ab842 100644 --- a/src/Tests/Processor/ProcessorIntegrationTest.php +++ b/src/Tests/Processor/ProcessorIntegrationTest.php @@ -32,7 +32,12 @@ class ProcessorIntegrationTest extends WebTestBase { 'name' => 'Test index', 'id' => $this->indexId, 'status' => 1, - 'datasources' => array('entity:node'), + 'datasource_settings' => array( + 'entity:node' => array( + 'plugin_id' => 'entity:user', + 'settings' => array(), + ), + ), ))->save(); } @@ -43,18 +48,91 @@ class ProcessorIntegrationTest extends WebTestBase { * avoid the overhead of having one test per processor. */ public function testProcessorIntegration() { + // By default, the add_url and language processors are already enabled. + $enabled = array('language', 'add_url'); + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkContentAccessIntegration(); + $enabled[] = 'content_access'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkHighlightIntegration(); + $enabled[] = 'highlight'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkHtmlFilterIntegration(); + $enabled[] = 'html_filter'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkIgnoreCaseIntegration(); + $enabled[] = 'ignorecase'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkIgnoreCharactersIntegration(); - $this->checkLanguageIntegration(); + $enabled[] = 'ignore_character'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkNodeStatusIntegration(); + $enabled[] = 'node_status'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkRenderedItemIntegration(); + $enabled[] = 'rendered_item'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkStopWordsIntegration(); + $enabled[] = 'stopwords'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkTokenizerIntegration(); + $enabled[] = 'tokenizer'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkTransliterationIntegration(); + $enabled[] = 'transliteration'; + sort($enabled); + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + + // The 'language' and 'add_url' processors are are not available to be removed + $actual_processors = array_keys($this->loadIndex()->getProcessors()); + sort($actual_processors); + $this->assertEqual($enabled, $actual_processors); + $this->checkLanguageIntegration(); + $this->assertEqual($enabled, $actual_processors); $this->checkUrlFieldIntegration(); + $this->assertEqual($enabled, $actual_processors); } /** @@ -168,10 +246,11 @@ class ProcessorIntegrationTest extends WebTestBase { */ public function checkLanguageIntegration() { $index = $this->loadIndex(); - $processors = $index->getProcessorSettings(); + $processors = $index->getProcessors(); $this->assertTrue(!empty($processors['language']), 'The "language" processor is enabled by default.'); - unset($processors['language']); - $index->setProcessorSettings($processors)->save(); + $index->removeProcessor('language'); + $index->save(); + $processors = $this->loadIndex()->getProcessors(); $this->assertTrue(!empty($processors['language']), 'The "language" processor cannot be disabled.'); } @@ -240,10 +319,11 @@ class ProcessorIntegrationTest extends WebTestBase { */ public function checkUrlFieldIntegration() { $index = $this->loadIndex(); - $processors = $index->getProcessorSettings(); + $processors = $index->getProcessors(); $this->assertTrue(!empty($processors['add_url']), 'The "Add URL" processor is enabled by default.'); - unset($processors['add_url']); - $index->setProcessorSettings($processors)->save(); + $index->removeProcessor('add_url'); + $index->save(); + $processors = $this->loadIndex()->getProcessors(); $this->assertTrue(!empty($processors['add_url']), 'The "Add URL" processor cannot be disabled.'); } diff --git a/src/Tests/Processor/ProcessorTestBase.php b/src/Tests/Processor/ProcessorTestBase.php index 2809c31..17d4932 100644 --- a/src/Tests/Processor/ProcessorTestBase.php +++ b/src/Tests/Processor/ProcessorTestBase.php @@ -9,6 +9,7 @@ namespace Drupal\search_api\Tests\Processor; use Drupal\search_api\Entity\Index; use Drupal\search_api\Entity\Server; +use Drupal\search_api\Item\Field; use Drupal\search_api\Utility; use Drupal\system\Tests\Entity\EntityUnitTestBase; @@ -87,37 +88,41 @@ abstract class ProcessorTestBase extends EntityUnitTestBase { 'id' => 'index', 'name' => 'Index name', 'status' => TRUE, - 'datasources' => array('entity:comment', 'entity:node'), + 'datasource_settings' => array( + 'entity:comment' => array( + 'plugin_id' => 'entity:comment', + 'settings' => array(), + ), + 'entity:node' => array( + 'plugin_id' => 'entity:node', + 'settings' => array(), + ), + ), 'server' => 'server', 'tracker' => 'default', )); $this->index->setServer($this->server); - $this->index->setFieldSettings(array( - 'subject' => array( - 'label' => 'Subject', - 'type' => 'text', - 'datasource_id' => 'entity:comment', - 'property_path' => 'subject', - ), - 'title' => array( - 'label' => 'Title', - 'type' => 'text', - 'datasource_id' => 'entity:node', - 'property_path' => 'title', - ), - )); - if ($processor) { - $this->index->setProcessorSettings(array( - $processor => array( - 'processor_id' => $processor, - 'weights' => array(), - 'settings' => array(), - ), - )); + $field_subject = new Field($this->index, 'subject'); + $field_subject->setType('text'); + $field_subject->setPropertyPath('subject'); + $field_subject->setDatasourceId('entity:comment'); + $field_subject->setLabel('Subject'); + + $field_title = new Field($this->index, 'title'); + $field_title->setType('text'); + $field_title->setPropertyPath('title'); + $field_title->setDatasourceId('entity:node'); + $field_title->setLabel('Title'); + + $this->index->addField($field_subject); + $this->index->addField($field_title); + + if ($processor) { /** @var \Drupal\search_api\Processor\ProcessorPluginManager $plugin_manager */ $plugin_manager = \Drupal::service('plugin.manager.search_api.processor'); $this->processor = $plugin_manager->createInstance($processor, array('index' => $this->index)); + $this->index->addProcessor($this->processor); } $this->index->save(); } diff --git a/src/Tests/Processor/RenderedItemTest.php b/src/Tests/Processor/RenderedItemTest.php index 8a920e4..4b561fc 100644 --- a/src/Tests/Processor/RenderedItemTest.php +++ b/src/Tests/Processor/RenderedItemTest.php @@ -115,6 +115,35 @@ class RenderedItemTest extends ProcessorTestBase { } /** + * Tests that the processor is added correctly. + */ + public function testAddProcessor() { + $processors = $this->index->getProcessors(); + $this->assertTrue( + array_key_exists('rendered_item', $processors), + 'Processor successfully added.' + ); + + $items = array(); + foreach ($this->nodes as $node) { + $items[] = array( + 'datasource' => 'entity:node', + 'item' => $node->getTypedData(), + 'item_id' => $node->id(), + 'text' => 'node text' . $node->id(), + ); + } + $items = $this->generateItems($items); + + foreach ($items as $item) { + $this->assertTrue( + array_key_exists('rendered_item', $item->getFields()), + 'Field successfully added.' + ); + } + } + + /** * Tests whether the rendered_item field is correctly filled by the processor. */ public function testPreprocessIndexItems() { diff --git a/src/Tests/WebTestBase.php b/src/Tests/WebTestBase.php index 8b85ea6..4dd9113 100644 --- a/src/Tests/WebTestBase.php +++ b/src/Tests/WebTestBase.php @@ -169,7 +169,12 @@ abstract class WebTestBase extends SimpletestWebTestBase { 'name' => $name, 'description' => $name . ' description', 'server' => $server_id, - 'datasources' => array($datasource_id), + 'datasource_settings' => array( + $datasource_id => array( + 'plugin_id' => $datasource_id, + 'settings' => array() + ) + ), )); $index->save(); $this->indexId = $index->id(); diff --git a/src/UnsavedIndexConfiguration.php b/src/UnsavedIndexConfiguration.php index 8fe07be..1f1045e 100644 --- a/src/UnsavedIndexConfiguration.php +++ b/src/UnsavedIndexConfiguration.php @@ -249,8 +249,8 @@ class UnsavedIndexConfiguration implements IndexInterface, UnsavedConfigurationI /** * {@inheritdoc} */ - public function getTracker() { - return $this->entity->getTracker(); + public function getTrackerInstance() { + return $this->entity->getTrackerInstance(); } /** @@ -277,8 +277,8 @@ class UnsavedIndexConfiguration implements IndexInterface, UnsavedConfigurationI /** * {@inheritdoc} */ - public function getServer() { - return $this->entity->getServer(); + public function getServerInstance() { + return $this->entity->getServerInstance(); } /** @@ -431,13 +431,6 @@ class UnsavedIndexConfiguration implements IndexInterface, UnsavedConfigurationI /** * {@inheritdoc} */ - public function resetCaches($include_stored = TRUE) { - return $this->entity->resetCaches($include_stored); - } - - /** - * {@inheritdoc} - */ public function query(array $options = array()) { return $this->entity->query($options); } diff --git a/src/Utility.php b/src/Utility.php index aed1a96..3674331 100644 --- a/src/Utility.php +++ b/src/Utility.php @@ -154,7 +154,7 @@ class Utility { if (empty(static::$dataTypeFallbackMapping[$index_id])) { $server = NULL; try { - $server = $index->getServer(); + $server = $index->getServerInstance(); } catch (SearchApiException $e) { // If the server isn't available, just ignore it here and return all diff --git a/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml b/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml index 4f42d29..e6c886a 100644 --- a/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml +++ b/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml @@ -2,7 +2,7 @@ id: database_search_index name: 'Test index' description: 'An index used for testing' read_only: false -fields: +field_settings: id: label: ID type: integer @@ -40,25 +40,28 @@ fields: property_path: search_api_language index_locked: true type_locked: true -processors: +processor_settings: add_url: - processor_id: add_url - weights: - preprocess_index: -30 - settings: { } + plugin_id: add_url + settings: + weights: + preprocess_index: -30 language: - processor_id: language - weights: - preprocess_index: -50 - settings: { } + plugin_id: language + settings: + weights: + preprocess_index: -50 options: cron_limit: -1 index_directly: false -datasources: - - 'entity:entity_test' -datasource_configs: { } -tracker: default -tracker_config: { } +datasource_settings: + 'entity:entity_test': + plugin_id: 'entity:entity_test' + settings: { } +tracker_settings: + 'default': + plugin_id: default + settings: { } server: database_search_server status: true langcode: en diff --git a/tests/src/Kernel/CliTest.php b/tests/src/Kernel/CliTest.php index 70fd5cc..95c3395 100644 --- a/tests/src/Kernel/CliTest.php +++ b/tests/src/Kernel/CliTest.php @@ -94,15 +94,20 @@ class CliTest extends KernelTestBase { 'name' => 'Test index', 'id' => 'index', 'status' => 1, - 'datasources' => array('entity:entity_test'), + 'datasource_settings' => array( + 'entity:entity_test' => array( + 'plugin_id' => 'entity:entity_test', + 'settings' => array(), + ), + ), 'tracker' => 'default', 'server' => $this->server->id(), 'options' => array('index_directly' => TRUE), )); $index->save(); - $total_items = $index->getTracker()->getTotalItemsCount(); - $indexed_items = $index->getTracker()->getIndexedItemsCount(); + $total_items = $index->getTrackerInstance()->getTotalItemsCount(); + $indexed_items = $index->getTrackerInstance()->getIndexedItemsCount(); $this->assertEquals($total_items, 2, 'The 2 items are tracked.'); $this->assertEquals($indexed_items, 0, 'No items are indexed'); @@ -122,8 +127,8 @@ class CliTest extends KernelTestBase { 'category' => 'item_category' ))->save(); - $total_items = $index->getTracker()->getTotalItemsCount(); - $indexed_items = $index->getTracker()->getIndexedItemsCount(); + $total_items = $index->getTrackerInstance()->getTotalItemsCount(); + $indexed_items = $index->getTrackerInstance()->getIndexedItemsCount(); $this->assertEquals($total_items, 4, 'All 4 items are tracked.'); $this->assertEquals($indexed_items, 2, '2 items are indexed'); diff --git a/tests/src/Kernel/CustomDataTypesTest.php b/tests/src/Kernel/CustomDataTypesTest.php index 56b9647..97dca85 100644 --- a/tests/src/Kernel/CustomDataTypesTest.php +++ b/tests/src/Kernel/CustomDataTypesTest.php @@ -116,25 +116,30 @@ class CustomDataTypesTest extends KernelTestBase { $item = $this->index->loadItem('entity:entity_test/1:en'); $item = Utility::createItemFromObject($this->index, $item, 'entity:entity_test/1:en'); - $name_field = $item->getField('name'); + $name_field = $item->getField('name'); $processed_value = $name_field->getValues()[0]; $processed_type = $name_field->getType(); + $label = $name_field->getLabel(); $this->assertEquals($original_value, $processed_value, 'The processed value matches the original value'); $this->assertEquals($original_type, $processed_type, 'The processed type matches the original type.'); + $this->assertEquals('Name', $label, 'The label is correctly set.'); // Reset the fields on the item and change to the supported data type. $item->setFieldsExtracted(FALSE); $item->setFields(array()); - $this->index->getField('name')->setType('search_api_test_data_type'); - $name_field = $item->getField('name'); + $this->index->getField('name') + ->setType('search_api_test_data_type') + ->setLabel("Test"); + $name_field = $item->getField('name'); $processed_value = $name_field->getValues()[0]; $processed_type = $name_field->getType(); $this->assertEquals($original_value, $processed_value, 'The processed value matches the original value'); $this->assertEquals('search_api_test_data_type', $processed_type, 'The processed type matches the new type.'); + $this->assertEquals('Test', $name_field->getLabel(), 'The label is correctly set.'); // Reset the fields on the item and change to the non-supported data type. $item->setFieldsExtracted(FALSE); diff --git a/tests/src/Kernel/DependencyRemovalTest.php b/tests/src/Kernel/DependencyRemovalTest.php index 9245486..08a16e7 100644 --- a/tests/src/Kernel/DependencyRemovalTest.php +++ b/tests/src/Kernel/DependencyRemovalTest.php @@ -37,6 +37,7 @@ class DependencyRemovalTest extends KernelTestBase { */ public static $modules = array( 'user', + 'system', 'search_api', 'search_api_test_backend', 'search_api_test_dependencies', @@ -48,6 +49,8 @@ class DependencyRemovalTest extends KernelTestBase { public function setUp() { parent::setUp(); + $this->installSchema('system', 'key_value_expire'); + // The server tasks manager is needed when removing a server. $mock = $this->getMock('Drupal\search_api\Task\ServerTaskManagerInterface'); $this->container->set('search_api.server_task_manager', $mock); @@ -57,9 +60,17 @@ class DependencyRemovalTest extends KernelTestBase { $this->index = Index::create(array( 'id' => 'test_index', 'name' => 'Test index', - 'tracker' => 'default', - 'datasources' => array( - 'entity:user', + 'tracker_settings' => array( + 'default' => array( + 'plugin_id' => 'default', + 'settings' => array() + ) + ), + 'datasource_settings' => array( + 'entity:user' => array( + 'plugin_id' => 'entity:user', + 'settings' => array(), + ) ), )); @@ -173,16 +184,21 @@ class DependencyRemovalTest extends KernelTestBase { // server. $dependency_key = $this->dependency->getConfigDependencyKey(); $dependency_name = $this->dependency->getConfigDependencyName(); - $this->index->set('datasources', array( - 'entity:user', - 'search_api_test_dependencies', - )); - $this->index->set('datasource_configs', array( - 'search_api_test_dependencies' => array( - $dependency_key => array( - $dependency_name, + $this->index->set( + 'datasource_settings', + array( + 'entity:user' => array( + 'plugin_id' => 'entity:user', + 'settings' => array(), + ), + 'search_api_test_dependencies' => array( + 'plugin_id' => 'search_api_test_dependencies', + 'settings' => array( + $dependency_key => array( + $dependency_name, + ), + ), ), - ), )); $this->index->save(); @@ -210,15 +226,13 @@ class DependencyRemovalTest extends KernelTestBase { // Depending on whether the plugin should have removed the dependency or // not, make sure the right action was taken. - $datasources = $this->index->get('datasources'); - $datasource_configs = $this->index->get('datasource_configs'); + $datasources = $this->index->get('datasource_settings'); if ($remove_dependency) { - $this->assertContains('search_api_test_dependencies', $datasources, 'Datasource not removed'); - $this->assertEmpty($datasource_configs['search_api_test_dependencies'], 'Datasource settings adapted'); + $this->assertArrayHasKey('search_api_test_dependencies', $datasources, 'Datasource not removed'); + $this->assertEmpty($datasources['search_api_test_dependencies']['settings'], 'Datasource settings adapted'); } else { - $this->assertNotContains('search_api_test_dependencies', $datasources, 'Datasource removed'); - $this->assertArrayNotHasKey('search_api_test_dependencies', $datasource_configs, 'Datasource config removed'); + $this->assertArrayNotHasKey('search_api_test_dependencies', $datasources, 'Datasource removed'); } } @@ -231,15 +245,13 @@ class DependencyRemovalTest extends KernelTestBase { // server. $dependency_key = $this->dependency->getConfigDependencyKey(); $dependency_name = $this->dependency->getConfigDependencyName(); - $this->index->set('datasources', array( - 'search_api_test_dependencies', - )); - $this->index->set('datasource_configs', array( + $this->index->set('datasource_settings', array( 'search_api_test_dependencies' => array( - $dependency_key => array( - $dependency_name, + 'plugin_id' => 'search_api_test_dependencies', + 'settings' => array( + $dependency_key => array($dependency_name) ), - ), + ) )); $this->index->save(); @@ -275,9 +287,9 @@ class DependencyRemovalTest extends KernelTestBase { // server. $dependency_key = $this->dependency->getConfigDependencyKey(); $dependency_name = $this->dependency->getConfigDependencyName(); - $this->index->set('processors', array( + $this->index->set('processor_settings', array( 'search_api_test_dependencies' => array( - 'processor_id' => 'search_api_test_dependencies', + 'plugin_id' => 'search_api_test_dependencies', 'settings' => array( $dependency_key => array( $dependency_name, @@ -311,7 +323,7 @@ class DependencyRemovalTest extends KernelTestBase { // Depending on whether the plugin should have removed the dependency or // not, make sure the right action was taken. - $processors = $this->index->get('processors'); + $processors = $this->index->get('processor_settings'); if ($remove_dependency) { $this->assertArrayHasKey('search_api_test_dependencies', $processors, 'Processor not removed'); $this->assertEmpty($processors['search_api_test_dependencies']['settings'], 'Processor settings adapted'); @@ -336,11 +348,15 @@ class DependencyRemovalTest extends KernelTestBase { // server. $dependency_key = $this->dependency->getConfigDependencyKey(); $dependency_name = $this->dependency->getConfigDependencyName(); - $this->index->set('tracker', 'search_api_test_dependencies'); - $this->index->set('tracker_config', array( - $dependency_key => array( - $dependency_name, - ), + $this->index->set('tracker_settings', array( + 'search_api_test_dependencies' => array( + 'plugin_id' => 'search_api_test_dependencies', + 'settings' => array( + $dependency_key => array( + $dependency_name, + ), + ) + ) )); $this->index->save(); @@ -375,8 +391,10 @@ class DependencyRemovalTest extends KernelTestBase { // Depending on whether the plugin should have removed the dependency or // not, make sure the right action was taken. - $tracker = $this->index->get('tracker'); - $tracker_config = $this->index->get('tracker_config'); + $config = $this->index->get('tracker_settings'); + $plugins = array_keys($config); + $tracker = $config[$plugins[0]]['plugin_id']; + $tracker_config = $config[$plugins[0]]['settings']; if ($remove_dependency) { $this->assertEquals('search_api_test_dependencies', $tracker, 'Tracker not reset'); $this->assertEmpty($tracker_config, 'Tracker settings adapted'); @@ -392,13 +410,19 @@ class DependencyRemovalTest extends KernelTestBase { */ public function testModuleDependency() { // Test with all types of plugins at once. - $this->index->set('datasources', array( - 'entity:user', - 'search_api_test_dependencies', + $this->index->set('datasource_settings', array( + 'entity:user' => array( + 'plugin_id' => 'entity:user', + 'settings' => array(), + ), + 'search_api_test_dependencies' => array( + 'plugin_id' => 'search_api_test_dependencies', + 'settings' => array(), + ), )); - $this->index->set('processors', array( + $this->index->set('processor_settings', array( 'search_api_test_dependencies' => array( - 'processor_id' => 'search_api_test_dependencies', + 'plugin_id' => 'search_api_test_dependencies', 'settings' => array(), ), )); @@ -439,6 +463,16 @@ class DependencyRemovalTest extends KernelTestBase { /** * Data provider for this class's test methods. * + * If $remove_dependency is TRUE, in Plugin::onDependencyRemoval() it clears + * its configuration (and thus its dependency, in those test plugins) and + * returns TRUE, which the index will take as "all OK, dependency removed" and + * leave the plugin where it is, only with updated configuration. + * + * If $remove_dependency is FALSE, Plugin::onDependencyRemoval() will do + * nothing and just return FALSE, the index says "oh, that plugin still has + * that removed dependency, so I should better remove the plugin" and the + * plugin gets removed. + * * @return array * An array of argument arrays for this class's test methods. */ diff --git a/tests/src/Kernel/IndexStorageTest.php b/tests/src/Kernel/IndexStorageTest.php index 0e89a46..bab7e78 100644 --- a/tests/src/Kernel/IndexStorageTest.php +++ b/tests/src/Kernel/IndexStorageTest.php @@ -64,7 +64,12 @@ class IndexStorageTest extends KernelTestBase { $indexData = array( 'id' => 'test', 'name' => 'Index test name', - 'tracker' => 'default', + 'tracker' => array( + 'default' => array( + 'plugin_id' => 'default', + 'settings' => array(), + ) + ), ); $index = $this->storage->create($indexData); diff --git a/tests/src/Kernel/LanguageKernelTest.php b/tests/src/Kernel/LanguageKernelTest.php index 671a957..75c8bc6 100644 --- a/tests/src/Kernel/LanguageKernelTest.php +++ b/tests/src/Kernel/LanguageKernelTest.php @@ -108,8 +108,18 @@ class LanguageKernelTest extends KernelTestBase { 'name' => 'Test Index', 'id' => 'test_index', 'status' => 1, - 'datasources' => array('entity:' . $this->testEntityTypeId), - 'tracker' => 'default', + 'datasource_settings' => array( + 'entity:' . $this->testEntityTypeId => array( + 'plugin_id' => 'entity:' . $this->testEntityTypeId, + 'settings' => array(), + ), + ), + 'tracker_settings' => array( + 'default' => array( + 'plugin_id' => 'default', + 'settings' => array(), + ) + ), 'server' => $this->server->id(), 'options' => array('index_directly' => FALSE), )); @@ -153,10 +163,10 @@ class LanguageKernelTest extends KernelTestBase { $this->assertEquals($expected, $datasource_item_ids, 'Datasource returns correct item ids.'); // Test indexing the new entity. - $this->assertEquals(0, $this->index->getTracker()->getIndexedItemsCount(), 'The index is empty.'); - $this->assertEquals(2, $this->index->getTracker()->getTotalItemsCount(), 'There are two items to be indexed.'); + $this->assertEquals(0, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'The index is empty.'); + $this->assertEquals(2, $this->index->getTrackerInstance()->getTotalItemsCount(), 'There are two items to be indexed.'); $this->index->indexItems(); - $this->assertEquals(2, $this->index->getTracker()->getIndexedItemsCount(), 'Two items have been indexed.'); + $this->assertEquals(2, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'Two items have been indexed.'); // Now, make the first entity language-specific by assigning a language. $default_langcode = $this->langcodes[0]; @@ -175,8 +185,8 @@ class LanguageKernelTest extends KernelTestBase { $this->assertEquals($expected, $datasource_item_ids, 'Datasource returns correct item ids.'); // Test that the index needs to be updated. - $this->assertEquals(1, $this->index->getTracker()->getIndexedItemsCount(), 'The updated item needs to be reindexed.'); - $this->assertEquals(2, $this->index->getTracker()->getTotalItemsCount(), 'There are two items in total.'); + $this->assertEquals(1, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'The updated item needs to be reindexed.'); + $this->assertEquals(2, $this->index->getTrackerInstance()->getTotalItemsCount(), 'There are two items in total.'); // Set two translations for the first entity and test that the datasource // returns three separate item IDs, one for each translation. @@ -197,8 +207,8 @@ class LanguageKernelTest extends KernelTestBase { $this->assertEquals($expected, $datasource_item_ids, 'Datasource returns correct item ids for a translated entity.'); // Test that the index needs to be updated. - $this->assertEquals(1, $this->index->getTracker()->getIndexedItemsCount(), 'The updated items needs to be reindexed.'); - $this->assertEquals(4, $this->index->getTracker()->getTotalItemsCount(), 'There are four items in total.'); + $this->assertEquals(1, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'The updated items needs to be reindexed.'); + $this->assertEquals(4, $this->index->getTrackerInstance()->getTotalItemsCount(), 'There are four items in total.'); // Delete one translation and test that the datasource returns only three // items. @@ -215,10 +225,10 @@ class LanguageKernelTest extends KernelTestBase { $this->assertEquals($expected, $datasource_item_ids, 'Datasource returns correct item ids for a translated entity.'); // Test reindexing. - $this->assertEquals(3, $this->index->getTracker()->getTotalItemsCount(), 'There are three items in total.'); - $this->assertEquals(1, $this->index->getTracker()->getIndexedItemsCount(), 'The updated items needs to be reindexed.'); + $this->assertEquals(3, $this->index->getTrackerInstance()->getTotalItemsCount(), 'There are three items in total.'); + $this->assertEquals(1, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'The updated items needs to be reindexed.'); $this->index->indexItems(); - $this->assertEquals(3, $this->index->getTracker()->getIndexedItemsCount(), 'Three items are indexed.'); + $this->assertEquals(3, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'Three items are indexed.'); } } diff --git a/tests/src/Kernel/ServerTaskTest.php b/tests/src/Kernel/ServerTaskTest.php index a31595d..a3faf29 100644 --- a/tests/src/Kernel/ServerTaskTest.php +++ b/tests/src/Kernel/ServerTaskTest.php @@ -91,8 +91,18 @@ class ServerTaskTest extends KernelTestBase { 'name' => 'Test index', 'id' => 'test_index', 'status' => 1, - 'datasources' => array('entity:user'), - 'tracker' => 'default', + 'datasource_settings' => array( + 'entity:user' => array( + 'plugin_id' => 'entity:user', + 'settings' => array(), + ), + ), + 'tracker' => array( + 'default' => array( + 'plugin_id' => 'default', + 'settings' => array(), + ) + ), 'server' => $this->server->id(), 'options' => array('index_directly' => FALSE), ));