Skip to content

Commit 8784274

Browse files
etpinardetpinard
committed
first attempt at fixing tests on etpinard's laptop
- use 14 (instead of 16) as "greater than fontsize dflt" `uniformtext.size` value - add tolenrence to selected assertion in sunburst and treemap tween text assertions
1 parent 603e0cc commit 8784274

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎test/jasmine/tests/bar_test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2888,19 +2888,19 @@ describe('bar uniformtext', function() {
28882888
scales: [0, 0, 0, 0, 0, 0, 0],
28892889
}))
28902890
.then(function() {
2891-
fig.layout.uniformtext.minsize = 16; // set a minsize greater than trace font size
2891+
fig.layout.uniformtext.minsize = 14; // set a minsize greater than trace font size
28922892
return Plotly.react(gd, fig);
28932893
})
2894-
.then(assertTextSizes('using minsize: 16', {
2895-
fontsizes: [16, 16, 16, 16, 16, 16, 16],
2894+
.then(assertTextSizes('using minsize: 14', {
2895+
fontsizes: [14, 14, 14, 14, 14, 14, 14],
28962896
scales: [0, 0.36, 0.36, 0.36, 0.36, 0.36, 0.36],
28972897
}))
28982898
.then(function() {
28992899
fig.layout.uniformtext.mode = 'show';
29002900
return Plotly.react(gd, fig);
29012901
})
29022902
.then(assertTextSizes('using mode: "show"', {
2903-
fontsizes: [16, 16, 16, 16, 16, 16, 16],
2903+
fontsizes: [14, 14, 14, 14, 14, 14, 14],
29042904
scales: [0.36, 0.36, 0.36, 0.36, 0.36, 0.36, 0.36],
29052905
}))
29062906
.catch(failTest)

‎test/jasmine/tests/funnel_test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,19 +1710,19 @@ describe('funnel uniformtext', function() {
17101710
scales: [0, 0, 0, 0, 0, 0, 0],
17111711
}))
17121712
.then(function() {
1713-
fig.layout.uniformtext.minsize = 16; // set a minsize greater than trace font size
1713+
fig.layout.uniformtext.minsize = 14; // set a minsize greater than trace font size
17141714
return Plotly.react(gd, fig);
17151715
})
1716-
.then(assertTextSizes('using minsize: 16', {
1717-
fontsizes: [16, 16, 16, 16, 16, 16, 16],
1716+
.then(assertTextSizes('using minsize: 14', {
1717+
fontsizes: [14, 14, 14, 14, 14, 14, 14],
17181718
scales: [0, 0.33, 0.33, 0.33, 0.33, 0.33, 0.33],
17191719
}))
17201720
.then(function() {
17211721
fig.layout.uniformtext.mode = 'show';
17221722
return Plotly.react(gd, fig);
17231723
})
17241724
.then(assertTextSizes('using mode: "show"', {
1725-
fontsizes: [16, 16, 16, 16, 16, 16, 16],
1725+
fontsizes: [14, 14, 14, 14, 14, 14, 14],
17261726
scales: [0.33, 0.33, 0.33, 0.33, 0.33, 0.33, 0.33],
17271727
}))
17281728
.catch(failTest)

‎test/jasmine/tests/sunburst_test.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ describe('Test sunburst tweening:', function() {
11871187
return s.replace(/\s/g, '');
11881188
}
11891189

1190-
function _assert(msg, attrName, id, exp) {
1190+
function _assert(msg, attrName, id, exp, tolerance) {
11911191
var lookup = {d: pathTweenFnLookup, transform: textTweenFnLookup}[attrName];
11921192
var fn = lookup[id];
11931193
// normalize time in [0, 1] where we'll assert the tweening fn output,
@@ -1199,7 +1199,7 @@ describe('Test sunburst tweening:', function() {
11991199
if(attrName === 'transform') {
12001200
var fake = {attr: function() { return actual; }};
12011201
var xy = Drawing.getTranslate(fake);
1202-
expect([xy.x, xy.y]).toBeWithinArray(exp, 2, msg2);
1202+
expect([xy.x, xy.y]).toBeWithinArray(exp, tolerance || 2, msg2);
12031203
} else {
12041204
// we could maybe to bring in:
12051205
// https://github.com/hughsk/svg-path-parser
@@ -1388,10 +1388,10 @@ describe('Test sunburst tweening:', function() {
13881388
.then(_run(gd, 4))
13891389
.then(function() {
13901390
_assert('move J text to new position', 'transform', 'J', [309.3085305481173, 202.66937078300114]);
1391-
_assert('move O text to new position', 'transform', 'O', [337.158534264498, 162.57550532369754]);
1391+
_assert('move O text to new position', 'transform', 'O', [337.158534264498, 162.57550532369754], 5);
13921392
_assert('move U text to new position', 'transform', 'U', [416.1153793700712, 163.4078137147134]);
13931393
_assert('move V text to new position', 'transform', 'V', [471.63745793297295, 218.00377184475153]);
1394-
_assert('move W text to new position', 'transform', 'W', [455.10235209157037, 177.717459723826]);
1394+
_assert('move W text to new position', 'transform', 'W', [455.10235209157037, 177.717459723826], 5);
13951395
_assert('move X text to new position', 'transform', 'X', [431.0320488371527, 145.88885474402548]);
13961396
_assert('move Y text to new position', 'transform', 'Y', [395.12660928295867, 124.11350635624726]);
13971397
_assert('move Z text to new position', 'transform', 'Z', [354.1550374068844, 115.63596810986363]);
@@ -1514,7 +1514,7 @@ describe('Test sunburst tweening:', function() {
15141514
.then(function() {
15151515
_assert('move U text to new position', 'transform', 'U', [313.79288001914836, 202.45694251914836]);
15161516
_assert('move V text to new position', 'transform', 'V', [441.011030377721, 188.63633201157208]);
1517-
_assert('move W text to new position', 'transform', 'W', [382.1346244328249, 135.0126788235936]);
1517+
_assert('move W text to new position', 'transform', 'W', [382.1346244328249, 135.0126788235936], 5);
15181518
_assert('move X text to new position', 'transform', 'X', [277.7815763779703, 162.7705278345142]);
15191519
_assert('move Y text to new position', 'transform', 'Y', [249.73412124927503, 271.78420776316403]);
15201520
_assert('move Z text to new position', 'transform', 'Z', [305.39156336654094, 331.3597434293286]);

‎test/jasmine/tests/treemap_test.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@ describe('Test treemap tweening:', function() {
13201320
}
13211321

13221322

1323-
function _assert(msg, attrName, id, exp) {
1323+
function _assert(msg, attrName, id, exp, tolerance) {
13241324
var lookup = {d: pathTweenFnLookup, transform: textTweenFnLookup}[attrName];
13251325
var fn = lookup[id];
13261326
// normalize time in [0, 1] where we'll assert the tweening fn output,
@@ -1332,7 +1332,7 @@ describe('Test treemap tweening:', function() {
13321332
if(attrName === 'transform') {
13331333
var fake = {attr: function() { return actual; }};
13341334
var xy = Drawing.getTranslate(fake);
1335-
expect([xy.x, xy.y]).toBeWithinArray(exp, 2, msg2);
1335+
expect([xy.x, xy.y]).toBeWithinArray(exp, tolerance || 2, msg2);
13361336
} else {
13371337
// we could maybe to bring in:
13381338
// https://github.com/hughsk/svg-path-parser
@@ -1365,8 +1365,8 @@ describe('Test treemap tweening:', function() {
13651365
_assert('update b to new position', 'd', 'b',
13661366
'M221.75,136L611,136L611,361L221.75,361Z'
13671367
);
1368-
_assert('move B text to new position', 'transform', 'B', [222.75, 126]);
1369-
_assert('move b text to new position', 'transform', 'b', [225.75, 150]);
1368+
_assert('move B text to new position', 'transform', 'B', [222.75, 126], 3);
1369+
_assert('move b text to new position', 'transform', 'b', [225.75, 150], 3);
13701370
})
13711371
.catch(failTest)
13721372
.then(done);
@@ -1397,8 +1397,8 @@ describe('Test treemap tweening:', function() {
13971397
_assert('update b to new position', 'd', 'b',
13981398
'M221.75,136L611,136L611,361L221.75,361Z'
13991399
);
1400-
_assert('move B text to new position', 'transform', 'B', [222.75, 126]);
1401-
_assert('move b text to new position', 'transform', 'b', [225.75, 150]);
1400+
_assert('move B text to new position', 'transform', 'B', [222.75, 126], 3);
1401+
_assert('move b text to new position', 'transform', 'b', [225.75, 150], 3);
14021402
})
14031403
.catch(failTest)
14041404
.then(done);
@@ -1429,7 +1429,7 @@ describe('Test treemap tweening:', function() {
14291429
_assert('enter b for parent position', 'd', 'b',
14301430
'M284.375,188.5L548.375,188.5L548.375,308.5L284.375,308.5Z'
14311431
);
1432-
_assert('move B text to new position', 'transform', 'B', [221.25, 126]);
1432+
_assert('move B text to new position', 'transform', 'B', [221.25, 126], 3);
14331433
_assert('enter b text to new position', 'transform', 'b', [286.63, 196.35]);
14341434
})
14351435
.catch(failTest)

‎test/jasmine/tests/waterfall_test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1833,19 +1833,19 @@ describe('waterfall uniformtext', function() {
18331833
scales: [0, 0, 0, 0, 0, 0, 0],
18341834
}))
18351835
.then(function() {
1836-
fig.layout.uniformtext.minsize = 16; // set a minsize greater than trace font size
1836+
fig.layout.uniformtext.minsize = 14; // set a minsize greater than trace font size
18371837
return Plotly.react(gd, fig);
18381838
})
1839-
.then(assertTextSizes('using minsize: 16', {
1840-
fontsizes: [16, 16, 16, 16, 16, 16, 16],
1839+
.then(assertTextSizes('using minsize: 14', {
1840+
fontsizes: [14, 14, 14, 14, 14, 14, 14],
18411841
scales: [0, 0.36, 0.36, 0.36, 0.36, 0.36, 0.36],
18421842
}))
18431843
.then(function() {
18441844
fig.layout.uniformtext.mode = 'show';
18451845
return Plotly.react(gd, fig);
18461846
})
18471847
.then(assertTextSizes('using mode: "show"', {
1848-
fontsizes: [16, 16, 16, 16, 16, 16, 16],
1848+
fontsizes: [14, 14, 14, 14, 14, 14, 14],
18491849
scales: [0.36, 0.36, 0.36, 0.36, 0.36, 0.36, 0.36],
18501850
}))
18511851
.catch(failTest)

0 commit comments

Comments
 (0)