From 74338809f9344f7b79d9639cfa346ad4b00b6170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= <simonas.serlinskas@nfq.com>
Date: Tue, 11 Aug 2015 11:13:48 +0300
Subject: [PATCH] added AbstractAggregation PREFIX to result expectations
---
tests/Aggregation/FilterAggregationTest.php | 11 ++++++-----
tests/Aggregation/FiltersAggregationTest.php | 7 ++++---
tests/Aggregation/GeoBoundsAggregationTest.php | 5 +++--
.../Aggregation/GeoDistanceAggregationTest.php | 3 ++-
tests/Aggregation/GlobalAggregationTest.php | 7 ++++---
tests/Aggregation/Ipv4RangeAggregationTest.php | 5 +++--
tests/Aggregation/NestedAggregationTest.php | 5 +++--
.../PercentileRanksAggregationTest.php | 3 ++-
tests/Aggregation/RangeAggregationTest.php | 11 ++++++-----
.../ReverseNestedAggregationTest.php | 7 ++++---
tests/Aggregation/StatsAggregationTest.php | 5 +++--
tests/Aggregation/TermsAggregationTest.php | 17 +++++++++--------
tests/Aggregation/TopHitsAggregationTest.php | 6 +++---
13 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/tests/Aggregation/FilterAggregationTest.php b/tests/Aggregation/FilterAggregationTest.php
index 64cf4ac..d13fdbd 100644
--- a/tests/Aggregation/FilterAggregationTest.php
+++ b/tests/Aggregation/FilterAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\FilterAggregation;
use ONGR\ElasticsearchDSL\BuilderInterface;
use ONGR\ElasticsearchDSL\Filter\MissingFilter;
@@ -42,7 +43,7 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->setFilter($filter);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'filter' => [
'test_filter' => [
'test_field' => ['test_value' => 'test'],
@@ -66,7 +67,7 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
->getMockForAbstractClass();
$aggregation2->expects($this->any())
->method('toArray')
- ->willReturn(['test_agg2' => ['avg' => []]]);
+ ->willReturn([AbstractAggregation::PREFIX.'test_agg2' => ['avg' => []]]);
$aggregation2->expects($this->any())
->method('getName')
->willReturn('test_agg2');
@@ -74,14 +75,14 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addAggregation($aggregation2);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'filter' => [
'test_filter' => [
'test_field' => ['test_value' => 'test'],
],
],
'aggregations' => [
- 'test_agg2' => [
+ AbstractAggregation::PREFIX.'test_agg2' => [
'avg' => [],
],
],
@@ -154,7 +155,7 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation = new FilterAggregation('test', $builderInterface);
$this->assertSame(
[
- 'test' => [
+ AbstractAggregation::PREFIX.'test' => [
'filter' => [null => null],
],
],
diff --git a/tests/Aggregation/FiltersAggregationTest.php b/tests/Aggregation/FiltersAggregationTest.php
index 667fbbd..9d91409 100644
--- a/tests/Aggregation/FiltersAggregationTest.php
+++ b/tests/Aggregation/FiltersAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\FiltersAggregation;
use ONGR\ElasticsearchDSL\BuilderInterface;
@@ -75,7 +76,7 @@ class FiltersAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addFilter($filter, 'second');
$results = $aggregation->toArray();
$expected = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'filters' => [
'filters' => [
'first' => [
@@ -121,7 +122,7 @@ class FiltersAggregationTest extends \PHPUnit_Framework_TestCase
$this->assertSame(
[
- 'test' => [
+ AbstractAggregation::PREFIX.'test' => [
'filters' => [
'filters' => [
'filter1' => ['type1' => null],
@@ -144,7 +145,7 @@ class FiltersAggregationTest extends \PHPUnit_Framework_TestCase
$this->assertSame(
[
- 'test' => [
+ AbstractAggregation::PREFIX.'test' => [
'filters' => [
'filters' => [
['type1' => null],
diff --git a/tests/Aggregation/GeoBoundsAggregationTest.php b/tests/Aggregation/GeoBoundsAggregationTest.php
index 8d8e258..aec9a1f 100644
--- a/tests/Aggregation/GeoBoundsAggregationTest.php
+++ b/tests/Aggregation/GeoBoundsAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\GeoBoundsAggregation;
/**
@@ -48,7 +49,7 @@ class GeoBoundsAggregationTest extends \PHPUnit_Framework_TestCase
$agg->setField('bar');
$agg->setWrapLongitude(true);
$result = [
- 'foo' => [
+ AbstractAggregation::PREFIX.'foo' => [
'geo_bounds' => [
'field' => 'bar',
'wrap_longitude' => true,
@@ -59,7 +60,7 @@ class GeoBoundsAggregationTest extends \PHPUnit_Framework_TestCase
$agg->setWrapLongitude(false);
$result = [
- 'foo' => [
+ AbstractAggregation::PREFIX.'foo' => [
'geo_bounds' => [
'field' => 'bar',
'wrap_longitude' => false,
diff --git a/tests/Aggregation/GeoDistanceAggregationTest.php b/tests/Aggregation/GeoDistanceAggregationTest.php
index a610f7b..7b7463f 100644
--- a/tests/Aggregation/GeoDistanceAggregationTest.php
+++ b/tests/Aggregation/GeoDistanceAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\GeoDistanceAggregation;
class GeoDistanceAggregationTest extends \PHPUnit_Framework_TestCase
@@ -133,7 +134,7 @@ class GeoDistanceAggregationTest extends \PHPUnit_Framework_TestCase
$this->assertSame(
[
- 'test' => [
+ AbstractAggregation::PREFIX.'test' => [
'geo_distance' => [
'field' => 'fieldName',
'origin' => 'originValue',
diff --git a/tests/Aggregation/GlobalAggregationTest.php b/tests/Aggregation/GlobalAggregationTest.php
index b425af0..e6d841e 100644
--- a/tests/Aggregation/GlobalAggregationTest.php
+++ b/tests/Aggregation/GlobalAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\GlobalAggregation;
class GlobalAggregationTest extends \PHPUnit_Framework_TestCase
@@ -28,7 +29,7 @@ class GlobalAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation = new GlobalAggregation('test_agg');
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'global' => new \stdClass(),
],
];
@@ -44,10 +45,10 @@ class GlobalAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addAggregation($aggregation2);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'global' => new \stdClass(),
'aggregations' => [
- 'test_agg_2' => [
+ AbstractAggregation::PREFIX.'test_agg_2' => [
'global' => new \stdClass(),
],
],
diff --git a/tests/Aggregation/Ipv4RangeAggregationTest.php b/tests/Aggregation/Ipv4RangeAggregationTest.php
index 3f33dd1..266a2d2 100644
--- a/tests/Aggregation/Ipv4RangeAggregationTest.php
+++ b/tests/Aggregation/Ipv4RangeAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\Ipv4RangeAggregation;
class Ipv4RangeAggregationTest extends \PHPUnit_Framework_TestCase
@@ -34,7 +35,7 @@ class Ipv4RangeAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation = new Ipv4RangeAggregation('test', 'fieldName', [['from' => 'fromValue']]);
$this->assertSame(
[
- 'test' => [
+ AbstractAggregation::PREFIX.'test' => [
'ip_range' => [
'field' => 'fieldName',
'ranges' => [['from' => 'fromValue']],
@@ -47,7 +48,7 @@ class Ipv4RangeAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation = new Ipv4RangeAggregation('test', 'fieldName', ['maskValue']);
$this->assertSame(
[
- 'test' => [
+ AbstractAggregation::PREFIX.'test' => [
'ip_range' => [
'field' => 'fieldName',
'ranges' => [['mask' => 'maskValue']],
diff --git a/tests/Aggregation/NestedAggregationTest.php b/tests/Aggregation/NestedAggregationTest.php
index 166a5c9..7a4f7f9 100644
--- a/tests/Aggregation/NestedAggregationTest.php
+++ b/tests/Aggregation/NestedAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\NestedAggregation;
class NestedAggregationTest extends \PHPUnit_Framework_TestCase
@@ -26,7 +27,7 @@ class NestedAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->setPath('test_path');
$expectedResult = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'nested' => ['path' => 'test_path'],
],
];
@@ -54,7 +55,7 @@ class NestedAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addAggregation($termMock);
$expectedResult = [
- 'test_nested_agg' => [
+ AbstractAggregation::PREFIX.'test_nested_agg' => [
'nested' => ['path' => 'test_path'],
'aggregations' => [
'terms' => [],
diff --git a/tests/Aggregation/PercentileRanksAggregationTest.php b/tests/Aggregation/PercentileRanksAggregationTest.php
index b96f216..fa51283 100644
--- a/tests/Aggregation/PercentileRanksAggregationTest.php
+++ b/tests/Aggregation/PercentileRanksAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\PercentileRanksAggregation;
/**
@@ -80,7 +81,7 @@ class PercentileRanksAggregationTest extends \PHPUnit_Framework_TestCase
$this->agg->setValues(['bar']);
$this->assertSame(
[
- 'foo' => [
+ AbstractAggregation::PREFIX.'foo' => [
'percentile_ranks' => [
'field' => 'bar',
'values' => ['bar'],
diff --git a/tests/Aggregation/RangeAggregationTest.php b/tests/Aggregation/RangeAggregationTest.php
index 5debcce..61d71a6 100644
--- a/tests/Aggregation/RangeAggregationTest.php
+++ b/tests/Aggregation/RangeAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\RangeAggregation;
class RangeAggregationTest extends \PHPUnit_Framework_TestCase
@@ -25,7 +26,7 @@ class RangeAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addRange('10', 20);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'range' => [
'field' => 'test_field',
'ranges' => [
@@ -54,7 +55,7 @@ class RangeAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addRange(null, '20', 'range_2');
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'range' => [
'field' => 'test_field',
'ranges' => [
@@ -90,7 +91,7 @@ class RangeAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addAggregation($aggregation2);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'range' => [
'field' => 'test_field',
'ranges' => [
@@ -102,7 +103,7 @@ class RangeAggregationTest extends \PHPUnit_Framework_TestCase
'keyed' => false,
],
'aggregations' => [
- 'test_agg_2' => [
+ AbstractAggregation::PREFIX.'test_agg_2' => [
'range' => [
'ranges' => [
[
@@ -208,7 +209,7 @@ class RangeAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation = new RangeAggregation('foo', 'fieldValue', [['from' => 'now', 'key' => 'nowkey']], true);
$this->assertSame(
[
- 'foo' => [
+ AbstractAggregation::PREFIX.'foo' => [
'range' => [
'keyed' => true,
'ranges' => [
diff --git a/tests/Aggregation/ReverseNestedAggregationTest.php b/tests/Aggregation/ReverseNestedAggregationTest.php
index 6cb8caa..cba7c8f 100644
--- a/tests/Aggregation/ReverseNestedAggregationTest.php
+++ b/tests/Aggregation/ReverseNestedAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\ReverseNestedAggregation;
class ReverseNestedAggregationTest extends \PHPUnit_Framework_TestCase
@@ -26,7 +27,7 @@ class ReverseNestedAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->setPath('test_path');
$expectedResult = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'reverse_nested' => ['path' => 'test_path'],
],
];
@@ -54,7 +55,7 @@ class ReverseNestedAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addAggregation($termMock);
$expectedResult = [
- 'test_nested_agg' => [
+ AbstractAggregation::PREFIX.'test_nested_agg' => [
'reverse_nested' => ['path' => 'test_path'],
'aggregations' => [
'terms' => [],
@@ -84,7 +85,7 @@ class ReverseNestedAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addAggregation($termMock);
$expectedResult = [
- 'test_nested_agg' => [
+ AbstractAggregation::PREFIX.'test_nested_agg' => [
'reverse_nested' => new \stdClass(),
'aggregations' => [
'terms' => [],
diff --git a/tests/Aggregation/StatsAggregationTest.php b/tests/Aggregation/StatsAggregationTest.php
index 21b6cfc..6b00d65 100644
--- a/tests/Aggregation/StatsAggregationTest.php
+++ b/tests/Aggregation/StatsAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\StatsAggregation;
class StatsAggregationTest extends \PHPUnit_Framework_TestCase
@@ -24,7 +25,7 @@ class StatsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->setField('test_field');
$expectedResult = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'stats' => ['field' => 'test_field'],
],
];
@@ -40,7 +41,7 @@ class StatsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation = new StatsAggregation('foo', 'fieldValue', 'scriptValue');
$this->assertSame(
[
- 'foo' => [
+ AbstractAggregation::PREFIX.'foo' => [
'stats' => [
'field' => 'fieldValue',
'script' => 'scriptValue',
diff --git a/tests/Aggregation/TermsAggregationTest.php b/tests/Aggregation/TermsAggregationTest.php
index 41df7ec..148e52c 100644
--- a/tests/Aggregation/TermsAggregationTest.php
+++ b/tests/Aggregation/TermsAggregationTest.php
@@ -11,6 +11,7 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\TermsAggregation;
class TermsAggregationTest extends \PHPUnit_Framework_TestCase
@@ -25,7 +26,7 @@ class TermsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->setField('test_field');
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'terms' => ['field' => 'test_field'],
],
];
@@ -44,7 +45,7 @@ class TermsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addParameter('size', 1);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'terms' => [
'field' => 'test_field',
'size' => 1,
@@ -60,7 +61,7 @@ class TermsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addParameter('size', 0);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'terms' => [
'field' => 'test_field',
'size' => 0,
@@ -83,7 +84,7 @@ class TermsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addParameter('min_doc_count', 10);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'terms' => [
'field' => 'test_field',
'size' => 1,
@@ -107,7 +108,7 @@ class TermsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addParameter('exclude', 'pizza_.*');
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'terms' => [
'field' => 'test_field',
'include' => 'test_.*',
@@ -143,7 +144,7 @@ class TermsAggregationTest extends \PHPUnit_Framework_TestCase
);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'terms' => [
'field' => 'test_field',
'include' => [
@@ -172,7 +173,7 @@ class TermsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addParameter('order', ['_count' => 'asc']);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'terms' => [
'field' => 'test_field',
'order' => ['_count' => 'asc'],
@@ -194,7 +195,7 @@ class TermsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addParameter('order', ['_term' => 'desc']);
$result = [
- 'test_agg' => [
+ AbstractAggregation::PREFIX.'test_agg' => [
'terms' => [
'field' => 'test_field',
'order' => ['_term' => 'desc'],
diff --git a/tests/Aggregation/TopHitsAggregationTest.php b/tests/Aggregation/TopHitsAggregationTest.php
index a48f016..0d97a7d 100644
--- a/tests/Aggregation/TopHitsAggregationTest.php
+++ b/tests/Aggregation/TopHitsAggregationTest.php
@@ -11,9 +11,9 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
use ONGR\ElasticsearchDSL\Aggregation\TopHitsAggregation;
use ONGR\ElasticsearchDSL\Sort\FieldSort;
-use ONGR\ElasticsearchDSL\Sort\Sorts;
/**
* Unit tests for top hits aggregation.
@@ -29,7 +29,7 @@ class TopHitsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation = new TopHitsAggregation('acme', 1, 1, $sort);
$expected = [
- 'acme' => [
+ AbstractAggregation::PREFIX.'acme' => [
'top_hits' => [
'sort' => [
'acme' => [],
@@ -52,7 +52,7 @@ class TopHitsAggregationTest extends \PHPUnit_Framework_TestCase
$aggregation->addParameter('_source', ['include' => ['title']]);
$expected = [
- 'acme' => [
+ AbstractAggregation::PREFIX.'acme' => [
'top_hits' => [
'size' => 0,
'from' => 1,
--
GitLab