/**
* The entity_test storage to create the test entities.
*
- * @var \Drupal\entity_test\EntityTestStorage
+ * @var \Drupal\Core\Entity\EntityStorageInterface
*/
protected $entityStorage;
*/
protected $queryResult;
- /**
- * The query factory to create entity queries.
- *
- * @var \Drupal\Core\Entity\Query\QueryFactory
- */
- public $factory;
-
protected function setUp() {
parent::setUp();
$this->entityStorage = $this->entityManager->getStorage('entity_test');
- $this->factory = $this->container->get('entity.query');
// Add some fieldapi fields to be used in the test.
for ($i = 1; $i <= 2; $i++) {
*/
public function testAggregation() {
// Apply a simple groupby.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('user_id')
->execute();
// Apply a simple aggregation for different aggregation functions.
foreach ($function_expected as $aggregation_function => $expected) {
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', $aggregation_function)
->execute();
$this->assertEqual($this->queryResult, $expected);
}
// Apply aggregation and groupby on the same query.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'COUNT')
->groupBy('user_id')
->execute();
]);
// Apply aggregation and a condition which matches.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'COUNT')
->groupBy('id')
->conditionAggregate('id', 'COUNT', 8)
$this->assertResults([]);
// Don't call aggregate to test the implicit aggregate call.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('id')
->conditionAggregate('id', 'COUNT', 8)
->execute();
$this->assertResults([]);
// Apply aggregation and a condition which matches.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'count')
->groupBy('id')
->conditionAggregate('id', 'COUNT', 6)
// Apply aggregation, a groupby and a condition which matches partially via
// the operator '='.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'count')
->conditionAggregate('id', 'count', 2)
->groupBy('user_id')
// Apply aggregation, a groupby and a condition which matches partially via
// the operator '>'.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'count')
->conditionAggregate('id', 'COUNT', 1, '>')
->groupBy('user_id')
// Apply aggregation and a sort. This might not be useful, but have a proper
// test coverage.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'COUNT')
->sortAggregate('id', 'COUNT')
->execute();
$this->assertSortedResults([['id_count' => 6]]);
// Don't call aggregate to test the implicit aggregate call.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->sortAggregate('id', 'COUNT')
->execute();
$this->assertSortedResults([['id_count' => 6]]);
// Apply aggregation, groupby and a sort descending.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'COUNT')
->groupBy('user_id')
->sortAggregate('id', 'COUNT', 'DESC')
]);
// Apply aggregation, groupby and a sort ascending.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'COUNT')
->groupBy('user_id')
->sortAggregate('id', 'COUNT', 'ASC')
// Apply aggregation, groupby, an aggregation condition and a sort with the
// operator '='.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'COUNT')
->groupBy('user_id')
->sortAggregate('id', 'COUNT')
// Apply aggregation, groupby, an aggregation condition and a sort with the
// operator '<' and order ASC.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'COUNT')
->groupBy('user_id')
->sortAggregate('id', 'COUNT', 'ASC')
// Apply aggregation, groupby, an aggregation condition and a sort with the
// operator '<' and order DESC.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('id', 'COUNT')
->groupBy('user_id')
->sortAggregate('id', 'COUNT', 'DESC')
// Test aggregation/groupby support for fieldapi fields.
// Just group by a fieldapi field.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->execute();
$this->assertResults([
]);
// Group by a fieldapi field and aggregate a normal property.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('user_id', 'COUNT')
->groupBy('field_test_1')
->execute();
]);
// Group by a normal property and aggregate a fieldapi field.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('field_test_1', 'COUNT')
->groupBy('user_id')
->execute();
['user_id' => 3, 'field_test_1_count' => 2],
]);
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('field_test_1', 'SUM')
->groupBy('user_id')
->execute();
]);
// Aggregate by two different fieldapi fields.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('field_test_1', 'SUM')
->aggregate('field_test_2', 'SUM')
->groupBy('user_id')
]);
// This time aggregate the same field twice.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('field_test_1', 'SUM')
->aggregate('field_test_1', 'COUNT')
->groupBy('user_id')
]);
// Group by and aggregate by a fieldapi field.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->aggregate('field_test_2', 'COUNT')
->execute();
// Group by and aggregate by a fieldapi field and use multiple aggregate
// functions.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->aggregate('field_test_2', 'COUNT')
->aggregate('field_test_2', 'SUM')
// Apply an aggregate condition for a fieldapi field and group by a simple
// property.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->conditionAggregate('field_test_1', 'COUNT', 3)
->groupBy('user_id')
->execute();
['user_id' => 3, 'field_test_1_count' => 2],
]);
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('field_test_1', 'SUM')
->conditionAggregate('field_test_1', 'COUNT', 2, '>')
->groupBy('user_id')
// Apply an aggregate condition for a simple property and a group by a
// fieldapi field.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->conditionAggregate('user_id', 'COUNT', 2)
->groupBy('field_test_1')
->execute();
['field_test_1' => 1, 'user_id_count' => 2],
]);
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->conditionAggregate('user_id', 'COUNT', 2, '>')
->groupBy('field_test_1')
->execute();
]);
// Apply an aggregate condition and a group by fieldapi fields.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->conditionAggregate('field_test_2', 'COUNT', 2)
->execute();
$this->assertResults([
['field_test_1' => 1, 'field_test_2_count' => 2],
]);
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->conditionAggregate('field_test_2', 'COUNT', 2, '>')
->execute();
// Apply an aggregate condition and a group by fieldapi fields with multiple
// conditions via AND.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->conditionAggregate('field_test_2', 'COUNT', 2)
->conditionAggregate('field_test_2', 'SUM', 8)
// Apply an aggregate condition and a group by fieldapi fields with multiple
// conditions via OR.
- $this->queryResult = $this->factory->getAggregate('entity_test', 'OR')
+ $this->queryResult = $this->entityStorage->getAggregateQuery('OR')
->groupBy('field_test_1')
->conditionAggregate('field_test_2', 'COUNT', 2)
->conditionAggregate('field_test_2', 'SUM', 8)
// Group by a normal property and aggregate a fieldapi field and sort by the
// groupby field.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('field_test_1', 'COUNT')
->groupBy('user_id')
->sort('user_id', 'DESC')
['user_id' => 1, 'field_test_1_count' => 1],
]);
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->aggregate('field_test_1', 'COUNT')
->groupBy('user_id')
->sort('user_id', 'ASC')
['user_id' => 3, 'field_test_1_count' => 2],
]);
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->conditionAggregate('field_test_1', 'COUNT', 2, '>')
->groupBy('user_id')
->sort('user_id', 'ASC')
// Group by a normal property, aggregate a fieldapi field, and sort by the
// aggregated field.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->sortAggregate('field_test_1', 'COUNT', 'DESC')
->groupBy('user_id')
->execute();
['user_id' => 1, 'field_test_1_count' => 1],
]);
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->sortAggregate('field_test_1', 'COUNT', 'ASC')
->groupBy('user_id')
->execute();
]);
// Group by and aggregate by fieldapi field, and sort by the groupby field.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->aggregate('field_test_2', 'COUNT')
->sort('field_test_1', 'ASC')
['field_test_1' => 3, 'field_test_2_count' => 1],
]);
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->aggregate('field_test_2', 'COUNT')
->sort('field_test_1', 'DESC')
// Groupby and aggregate by fieldapi field, and sort by the aggregated
// field.
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->sortAggregate('field_test_2', 'COUNT', 'DESC')
->execute();
['field_test_1' => 3, 'field_test_2_count' => 1],
]);
- $this->queryResult = $this->factory->getAggregate('entity_test')
+ $this->queryResult = $this->entityStorage->getAggregateQuery()
->groupBy('field_test_1')
->sortAggregate('field_test_2', 'COUNT', 'ASC')
->execute();