github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixed a bug in _bucket_count_between logic, updated tests too

Browse source
This commit is contained in:
Spencer Alger 2014-09-18 16:41:32 -07:00
parent e8fd38be0d
commit 32fca1dc41
2 changed files with 52 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/kibana/components/agg_types/buckets/_bucket_count_between.js
View file

@ -27,12 +27,12 @@ define(function (require) {
var negative = (aIndex > bIndex);
var count = aggs
.slice(aIndex, bIndex - aIndex - 1)
.slice(Math.min(aIndex, bIndex), Math.max(aIndex, bIndex))
.reduce(function (count, cfg) {
if (cfg.schema.group === 'buckets') {
return count + 1;
} else {
if (cfg === aggConfigA || cfg === aggConfigB || cfg.schema.group !== 'buckets') {
return count;
} else {
return count + 1;
}
}, 0);

84
test/unit/specs/components/agg_types/_bucket_count_between.js
View file

@ -145,49 +145,61 @@ define(function (require) {
expect(bucketCountBetween(a, b)).to.be(null);
});
it('can count', function () {
var schemas = visTypes.byName.histogram.schemas.buckets;
function countTest(pre, post) {
return function () {
var schemas = visTypes.byName.histogram.schemas.buckets;
// slow for this test is actually somewhere around 1/2 a sec
this.slow(500);
// slow for this test is actually somewhere around 1/2 a sec
this.slow(500);
function randBucketAggForVis(vis) {
var schema = _.sample(schemas);
var aggType = _.sample(aggTypes.byType.buckets);
function randBucketAggForVis(vis) {
var schema = _.sample(schemas);
var aggType = _.sample(aggTypes.byType.buckets);
return new AggConfig(vis, {
schema: schema,
type: aggType
});
}
_.times(50, function (n) {
var vis = new Vis(indexPattern, {
type: 'histogram',
aggs: []
});
var randBucketAgg = _.partial(randBucketAggForVis, vis);
var a = randBucketAgg();
var b = randBucketAgg();
// create n aggs between a and b
var aggs = [];
for (var i = 0; i < n; i++) {
aggs.push(randBucketAgg());
return new AggConfig(vis, {
schema: schema,
type: aggType
});
}
aggs.unshift(a);
aggs.push(b);
_.times(50, function (n) {
var vis = new Vis(indexPattern, {
type: 'histogram',
aggs: []
});
vis.setState({
type: 'histogram',
aggs: aggs
var randBucketAgg = _.partial(randBucketAggForVis, vis);
var a = randBucketAgg();
var b = randBucketAgg();
// create n aggs between a and b
var aggs = [];
aggs.fill = function (n) {
for (var 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);
});
};
}
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));
}];
});