From 30676a4a9521b26f1a86cd34b49379a7943eaa14 Mon Sep 17 00:00:00 2001 From: Stacey Gammon Date: Fri, 7 Apr 2017 08:34:09 -0400 Subject: [PATCH] Remove unused file + tests (#11052) --- .../__tests__/bucket_count_between.js | 211 ------------------ src/ui/public/agg_types/__tests__/index.js | 1 - .../buckets/_bucket_count_between.js | 42 ---- 3 files changed, 254 deletions(-) delete mode 100644 src/ui/public/agg_types/__tests__/bucket_count_between.js delete mode 100644 src/ui/public/agg_types/buckets/_bucket_count_between.js diff --git a/src/ui/public/agg_types/__tests__/bucket_count_between.js b/src/ui/public/agg_types/__tests__/bucket_count_between.js deleted file mode 100644 index 61f0828f4b14f..0000000000000 --- a/src/ui/public/agg_types/__tests__/bucket_count_between.js +++ /dev/null @@ -1,211 +0,0 @@ -import _ from 'lodash'; -import expect from 'expect.js'; -import ngMock from 'ng_mock'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import VisProvider from 'ui/vis'; -import RegistryVisTypesProvider from 'ui/registry/vis_types'; -import AggTypesIndexProvider from 'ui/agg_types/index'; -import VisAggConfigProvider from 'ui/vis/agg_config'; -import AggTypesBucketsBucketCountBetweenProvider from 'ui/agg_types/buckets/_bucket_count_between'; -describe('bucketCountBetween util', function () { - let indexPattern; - let Vis; - let visTypes; - let aggTypes; - let AggConfig; - let bucketCountBetween; - - // http://cwestblog.com/2014/02/25/javascript-testing-for-negative-zero/ - // works for -0 and +0 - function isNegative(n) { - return ((n = +n) || 1 / n) < 0; - } - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private) { - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - Vis = Private(VisProvider); - visTypes = Private(RegistryVisTypesProvider); - aggTypes = Private(AggTypesIndexProvider); - AggConfig = Private(VisAggConfigProvider); - bucketCountBetween = Private(AggTypesBucketsBucketCountBetweenProvider); - })); - - it('returns a positive number when a is before b', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'date_histogram', - schema: 'segment' - }, - { - type: 'terms', - schema: 'segment' - } - ] - }); - - const a = vis.aggs.byTypeName.date_histogram[0]; - const b = vis.aggs.byTypeName.terms[0]; - const count = bucketCountBetween(a, b); - expect(isNegative(count)).to.be(false); - }); - - it('returns a negative number when a is after b', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'date_histogram', - schema: 'segment' - }, - { - type: 'terms', - schema: 'segment' - } - ] - }); - - const a = vis.aggs.byTypeName.terms[0]; - const b = vis.aggs.byTypeName.date_histogram[0]; - const count = bucketCountBetween(a, b); - expect(isNegative(count)).to.be(true); - }); - - it('returns 0 when there are no buckets between a and b', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'date_histogram', - schema: 'segment' - }, - { - type: 'terms', - schema: 'segment' - } - ] - }); - - const a = vis.aggs.byTypeName.date_histogram[0]; - const b = vis.aggs.byTypeName.terms[0]; - expect(bucketCountBetween(a, b)).to.be(0); - }); - - it('returns null when b is not in the aggs', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'date_histogram', - schema: 'segment' - } - ] - }); - - const a = vis.aggs.byTypeName.date_histogram[0]; - const b = new AggConfig(vis, { - type: 'terms', - schema: 'segment' - }); - - expect(bucketCountBetween(a, b)).to.be(null); - }); - - it('returns null when a is not in the aggs', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [ - { - type: 'date_histogram', - schema: 'segment' - } - ] - }); - - const a = new AggConfig(vis, { - type: 'terms', - schema: 'segment' - }); - const b = vis.aggs.byTypeName.date_histogram[0]; - - expect(bucketCountBetween(a, b)).to.be(null); - }); - - it('returns null when a and b are not in the aggs', function () { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [] - }); - - const a = new AggConfig(vis, { - type: 'terms', - schema: 'segment' - }); - - const b = new AggConfig(vis, { - type: 'date_histogram', - schema: 'segment' - }); - - expect(bucketCountBetween(a, b)).to.be(null); - }); - - function countTest(pre, post) { - return function () { - const schemas = visTypes.byName.histogram.schemas.buckets; - - // slow for this test is actually somewhere around 1/2 a sec - this.slow(500); - - function randBucketAggForVis(vis) { - const schema = _.sample(schemas); - const aggType = _.sample(aggTypes.byType.buckets); - - return new AggConfig(vis, { - schema: schema, - type: aggType - }); - } - - _.times(50, function (n) { - const vis = new Vis(indexPattern, { - type: 'histogram', - aggs: [] - }); - - const randBucketAgg = _.partial(randBucketAggForVis, vis); - - const a = randBucketAgg(); - const b = randBucketAgg(); - - // create n aggs between a and b - const aggs = []; - aggs.fill = function (n) { - for (let i = 0; i < n; i++) { - aggs.push(randBucketAgg()); - } - }; - - pre && aggs.fill(_.random(0, 10)); - aggs.push(a); - aggs.fill(n); - aggs.push(b); - post && aggs.fill(_.random(0, 10)); - - vis.setState({ - type: 'histogram', - aggs: aggs - }); - - expect(bucketCountBetween(a, b)).to.be(n); - }); - }; - } - - it('can count', countTest()); - it('can count with elements before', countTest(true)); - it('can count with elements after', countTest(false, true)); - it('can count with elements before and after', countTest(true, true)); -}); diff --git a/src/ui/public/agg_types/__tests__/index.js b/src/ui/public/agg_types/__tests__/index.js index 6abdc93af24e1..25801cf0a68cf 100644 --- a/src/ui/public/agg_types/__tests__/index.js +++ b/src/ui/public/agg_types/__tests__/index.js @@ -2,7 +2,6 @@ import expect from 'expect.js'; import ngMock from 'ng_mock'; import './agg_type'; import './agg_params'; -import './bucket_count_between'; import './buckets/_histogram'; import './buckets/_geo_hash'; import './buckets/_range'; diff --git a/src/ui/public/agg_types/buckets/_bucket_count_between.js b/src/ui/public/agg_types/buckets/_bucket_count_between.js deleted file mode 100644 index 64310c08be8b7..0000000000000 --- a/src/ui/public/agg_types/buckets/_bucket_count_between.js +++ /dev/null @@ -1,42 +0,0 @@ -export default function BucketCountBetweenProvider() { - - /** - * Count the number of bucket aggs between two agg config objects owned - * by the same vis. - * - * If one of the two aggs was not found in the agg list, returns null. - * If a was found after b, the count will be negative - * If a was found first, the count will be positive. - * - * @param {AggConfig} aggConfigA - the aggConfig that is expected first - * @param {AggConfig} aggConfigB - the aggConfig that is expected second - * @return {null|number} - */ - function bucketCountBetween(aggConfigA, aggConfigB) { - const aggs = aggConfigA.vis.aggs.getRequestAggs(); - - const aIndex = aggs.indexOf(aggConfigA); - const bIndex = aggs.indexOf(aggConfigB); - - if (aIndex === -1 || bIndex === -1) { - return null; - } - - // return a negative distance, if b is before a - const negative = (aIndex > bIndex); - - const count = aggs - .slice(Math.min(aIndex, bIndex), Math.max(aIndex, bIndex)) - .reduce(function (count, cfg) { - if (cfg === aggConfigA || cfg === aggConfigB || cfg.schema.group !== 'buckets') { - return count; - } else { - return count + 1; - } - }, 0); - - return (negative ? -1 : 1) * count; - } - - return bucketCountBetween; -}