Skip to content

Commit 4e83ef7

Browse files
etpinardetpinard
committed
fixup bar/histogram tests
1 parent 5ca8b36 commit 4e83ef7

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎src/traces/bar/plot.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,13 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
156156
var textSelection = bar.append('text')
157157
.text(text)
158158
.attr({
159-
'class': 'bartext',
159+
'class': 'bartext bartext-' + textPosition,
160160
transform: '',
161161
'text-anchor': 'middle',
162162
// prohibit tex interpretation until we can handle
163163
// tex and regular text together
164164
'data-notex': 1
165165
})
166-
.classed('bartext-' + textPosition, true)
167166
.call(Drawing.font, textFont)
168167
.call(svgTextUtils.convertToTspans, gd);
169168

@@ -208,6 +207,7 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
208207
if(textPosition === 'auto') {
209208
if(isOutmostBar) {
210209
// draw text using insideTextFont and check if it fits inside bar
210+
textPosition = 'inside';
211211
textSelection = appendTextNode(bar, text, insideTextFont);
212212

213213
textBB = Drawing.bBox(textSelection.node()),

‎test/jasmine/tests/histogram_test.js

+26-26
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@ describe('Test histogram', function() {
206206
expect(out).toEqual([
207207
// full calcdata has x and y too (and t in the first one),
208208
// but those come later from setPositions.
209-
{b: 0, p: d70, s: 2, pts: [0, 1], p0: d70, p1: d70},
210-
{b: 0, p: d71, s: 1, pts: [2], p0: d71, p1: d71},
211-
{b: 0, p: d72, s: 0, pts: [], p0: d72, p1: d72},
212-
{b: 0, p: d73, s: 1, pts: [3], p0: d73, p1: d73}
209+
{i: 0, b: 0, p: d70, s: 2, pts: [0, 1], p0: d70, p1: d70},
210+
{i: 1, b: 0, p: d71, s: 1, pts: [2], p0: d71, p1: d71},
211+
{i: 2, b: 0, p: d72, s: 0, pts: [], p0: d72, p1: d72},
212+
{i: 3, b: 0, p: d73, s: 1, pts: [3], p0: d73, p1: d73}
213213
]);
214214

215215
// All data on exact months: shift so bin center is on (31-day months)
@@ -223,10 +223,10 @@ describe('Test histogram', function() {
223223
var d70mar = Date.UTC(1970, 2, 2, 12);
224224
var d70apr = Date.UTC(1970, 3, 1);
225225
expect(out).toEqual([
226-
{b: 0, p: d70, s: 2, pts: [0, 1], p0: d70, p1: d70},
227-
{b: 0, p: d70feb, s: 1, pts: [2], p0: d70feb, p1: d70feb},
228-
{b: 0, p: d70mar, s: 0, pts: [], p0: d70mar, p1: d70mar},
229-
{b: 0, p: d70apr, s: 1, pts: [3], p0: d70apr, p1: d70apr}
226+
{i: 0, b: 0, p: d70, s: 2, pts: [0, 1], p0: d70, p1: d70},
227+
{i: 1, b: 0, p: d70feb, s: 1, pts: [2], p0: d70feb, p1: d70feb},
228+
{i: 2, b: 0, p: d70mar, s: 0, pts: [], p0: d70mar, p1: d70mar},
229+
{i: 3, b: 0, p: d70apr, s: 1, pts: [3], p0: d70apr, p1: d70apr}
230230
]);
231231

232232
// data on exact days: shift so each bin goes from noon to noon
@@ -248,11 +248,11 @@ describe('Test histogram', function() {
248248

249249
expect(out).toEqual([
250250
// dec 31 12:00 -> jan 31 12:00, middle is jan 16
251-
{b: 0, p: Date.UTC(1970, 0, 16), s: 2, pts: [0, 1], p0: Date.UTC(1970, 0, 1), p1: Date.UTC(1970, 0, 31)},
251+
{i: 0, b: 0, p: Date.UTC(1970, 0, 16), s: 2, pts: [0, 1], p0: Date.UTC(1970, 0, 1), p1: Date.UTC(1970, 0, 31)},
252252
// jan 31 12:00 -> feb 28 12:00, middle is feb 14 12:00
253-
{b: 0, p: Date.UTC(1970, 1, 14, 12), s: 1, pts: [2], p0: Date.UTC(1970, 1, 1), p1: Date.UTC(1970, 1, 28)},
254-
{b: 0, p: Date.UTC(1970, 2, 16), s: 0, pts: [], p0: Date.UTC(1970, 2, 1), p1: Date.UTC(1970, 2, 31)},
255-
{b: 0, p: Date.UTC(1970, 3, 15, 12), s: 1, pts: [3], p0: Date.UTC(1970, 3, 1), p1: Date.UTC(1970, 3, 30)}
253+
{i: 1, b: 0, p: Date.UTC(1970, 1, 14, 12), s: 1, pts: [2], p0: Date.UTC(1970, 1, 1), p1: Date.UTC(1970, 1, 28)},
254+
{i: 2, b: 0, p: Date.UTC(1970, 2, 16), s: 0, pts: [], p0: Date.UTC(1970, 2, 1), p1: Date.UTC(1970, 2, 31)},
255+
{i: 3, b: 0, p: Date.UTC(1970, 3, 15, 12), s: 1, pts: [3], p0: Date.UTC(1970, 3, 1), p1: Date.UTC(1970, 3, 30)}
256256
]);
257257
});
258258

@@ -268,10 +268,10 @@ describe('Test histogram', function() {
268268
x3 = x2 + oneDay;
269269

270270
expect(out).toEqual([
271-
{b: 0, p: x0, s: 2, pts: [0, 1], p0: x0, p1: x0},
272-
{b: 0, p: x1, s: 1, pts: [2], p0: x1, p1: x1},
273-
{b: 0, p: x2, s: 0, pts: [], p0: x2, p1: x2},
274-
{b: 0, p: x3, s: 1, pts: [3], p0: x3, p1: x3}
271+
{i: 0, b: 0, p: x0, s: 2, pts: [0, 1], p0: x0, p1: x0},
272+
{i: 1, b: 0, p: x1, s: 1, pts: [2], p0: x1, p1: x1},
273+
{i: 2, b: 0, p: x2, s: 0, pts: [], p0: x2, p1: x2},
274+
{i: 3, b: 0, p: x3, s: 1, pts: [3], p0: x3, p1: x3}
275275
]);
276276
});
277277

@@ -295,7 +295,7 @@ describe('Test histogram', function() {
295295
});
296296

297297
expect(out).toEqual([
298-
{b: 0, p: 3, s: 3, width1: 2, pts: [0, 1, 2], p0: 2, p1: 3.9}
298+
{i: 0, b: 0, p: 3, s: 3, width1: 2, pts: [0, 1, 2], p0: 2, p1: 3.9}
299299
]);
300300
});
301301

@@ -308,7 +308,7 @@ describe('Test histogram', function() {
308308
});
309309

310310
expect(out).toEqual([
311-
{b: 0, p: 1.1, s: 3, width1: 0.5, pts: [0, 1, 2], p0: 1.1, p1: 1.1}
311+
{i: 0, b: 0, p: 1.1, s: 3, width1: 0.5, pts: [0, 1, 2], p0: 1.1, p1: 1.1}
312312
]);
313313
});
314314

@@ -321,7 +321,7 @@ describe('Test histogram', function() {
321321
});
322322

323323
expect(out).toEqual([
324-
{b: 0, p: 17, s: 2, width1: 2, pts: [2, 4], p0: 17, p1: 17}
324+
{i: 0, b: 0, p: 17, s: 2, width1: 2, pts: [2, 4], p0: 17, p1: 17}
325325
]);
326326
});
327327

@@ -334,7 +334,7 @@ describe('Test histogram', function() {
334334
});
335335

336336
expect(out).toEqual([
337-
{b: 0, p: 13, s: 2, width1: 8, pts: [1, 3], p0: 13, p1: 13}
337+
{i: 0, b: 0, p: 13, s: 2, width1: 8, pts: [1, 3], p0: 13, p1: 13}
338338
]);
339339
});
340340

@@ -348,7 +348,7 @@ describe('Test histogram', function() {
348348

349349
var p = 1296691200000;
350350
expect(out).toEqual([
351-
{b: 0, p: p, s: 2, width1: 2 * 24 * 3600 * 1000, pts: [1, 3], p0: p, p1: p}
351+
{i: 0, b: 0, p: p, s: 2, width1: 2 * 24 * 3600 * 1000, pts: [1, 3], p0: p, p1: p}
352352
]);
353353
});
354354

@@ -361,7 +361,7 @@ describe('Test histogram', function() {
361361
});
362362

363363
expect(out).toEqual([
364-
{b: 0, p: 97, s: 2, width1: 1, pts: [1, 3], p0: 97, p1: 97}
364+
{i: 0, b: 0, p: 97, s: 2, width1: 1, pts: [1, 3], p0: 97, p1: 97}
365365
]);
366366
});
367367

@@ -453,10 +453,10 @@ describe('Test histogram', function() {
453453
it('makes the right base histogram', function() {
454454
var baseOut = _calc(base);
455455
expect(baseOut).toEqual([
456-
{b: 0, p: 2, s: 1, pts: [0], p0: 0, p1: 0},
457-
{b: 0, p: 7, s: 2, pts: [1, 4], p0: 5, p1: 5},
458-
{b: 0, p: 12, s: 3, pts: [2, 5, 7], p0: 10, p1: 10},
459-
{b: 0, p: 17, s: 4, pts: [3, 6, 8, 9], p0: 15, p1: 15},
456+
{i: 0, b: 0, p: 2, s: 1, pts: [0], p0: 0, p1: 0},
457+
{i: 1, b: 0, p: 7, s: 2, pts: [1, 4], p0: 5, p1: 5},
458+
{i: 2, b: 0, p: 12, s: 3, pts: [2, 5, 7], p0: 10, p1: 10},
459+
{i: 3, b: 0, p: 17, s: 4, pts: [3, 6, 8, 9], p0: 15, p1: 15},
460460
]);
461461
});
462462

0 commit comments

Comments
 (0)