Skip to content

Commit e77cacc

Browse files
etpinardetpinard
committed
adapt test for Axex.expand -> findExtremes change
1 parent c45427b commit e77cacc

File tree

3 files changed

+54
-92
lines changed

3 files changed

+54
-92
lines changed

‎test/jasmine/tests/axes_test.js

Lines changed: 51 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,15 +1652,12 @@ describe('Test axes', function() {
16521652
});
16531653
});
16541654

1655-
describe('expand', function() {
1656-
var expand = Axes.expand;
1657-
var ax, data, options;
1655+
describe('findExtremes', function() {
1656+
var findExtremes = Axes.findExtremes;
1657+
var ax, data, options, out;
16581658

1659-
// Axes.expand modifies ax, so this provides a simple
1660-
// way of getting a new clean copy each time.
16611659
function getDefaultAx() {
16621660
return {
1663-
autorange: true,
16641661
c2l: Number,
16651662
type: 'linear',
16661663
_m: 1
@@ -1671,55 +1668,42 @@ describe('Test axes', function() {
16711668
ax = getDefaultAx();
16721669
data = [1, 4, 7, 2];
16731670

1674-
expand(ax, data);
1675-
1676-
expect(ax._min).toEqual([{val: 1, pad: 0, extrapad: false}]);
1677-
expect(ax._max).toEqual([{val: 7, pad: 0, extrapad: false}]);
1671+
out = findExtremes(ax, data);
1672+
expect(out.min).toEqual([{val: 1, pad: 0, extrapad: false}]);
1673+
expect(out.max).toEqual([{val: 7, pad: 0, extrapad: false}]);
16781674
});
16791675

16801676
it('calls ax.setScale if necessary', function() {
1681-
ax = {
1682-
autorange: true,
1683-
c2l: Number,
1684-
type: 'linear',
1685-
setScale: function() {}
1686-
};
1677+
ax = getDefaultAx();
1678+
delete ax._m;
1679+
ax.setScale = function() {};
16871680
spyOn(ax, 'setScale');
16881681

1689-
expand(ax, [1]);
1690-
1682+
findExtremes(ax, [1]);
16911683
expect(ax.setScale).toHaveBeenCalled();
16921684
});
16931685

16941686
it('handles symmetric pads as numbers', function() {
16951687
ax = getDefaultAx();
16961688
data = [1, 4, 2, 7];
1697-
options = {
1698-
vpad: 2,
1699-
ppad: 10
1700-
};
1689+
options = {vpad: 2, ppad: 10};
17011690

1702-
expand(ax, data, options);
1703-
1704-
expect(ax._min).toEqual([{val: -1, pad: 10, extrapad: false}]);
1705-
expect(ax._max).toEqual([{val: 9, pad: 10, extrapad: false}]);
1691+
out = findExtremes(ax, data, options);
1692+
expect(out.min).toEqual([{val: -1, pad: 10, extrapad: false}]);
1693+
expect(out.max).toEqual([{val: 9, pad: 10, extrapad: false}]);
17061694
});
17071695

17081696
it('handles symmetric pads as number arrays', function() {
17091697
ax = getDefaultAx();
17101698
data = [1, 4, 2, 7];
1711-
options = {
1712-
vpad: [1, 10, 6, 3],
1713-
ppad: [0, 15, 20, 10]
1714-
};
1715-
1716-
expand(ax, data, options);
1699+
options = {vpad: [1, 10, 6, 3], ppad: [0, 15, 20, 10]};
17171700

1718-
expect(ax._min).toEqual([
1701+
out = findExtremes(ax, data, options);
1702+
expect(out.min).toEqual([
17191703
{val: -6, pad: 15, extrapad: false},
17201704
{val: -4, pad: 20, extrapad: false}
17211705
]);
1722-
expect(ax._max).toEqual([
1706+
expect(out.max).toEqual([
17231707
{val: 14, pad: 15, extrapad: false},
17241708
{val: 8, pad: 20, extrapad: false}
17251709
]);
@@ -1735,10 +1719,9 @@ describe('Test axes', function() {
17351719
ppadplus: 20
17361720
};
17371721

1738-
expand(ax, data, options);
1739-
1740-
expect(ax._min).toEqual([{val: -4, pad: 10, extrapad: false}]);
1741-
expect(ax._max).toEqual([{val: 11, pad: 20, extrapad: false}]);
1722+
out = findExtremes(ax, data, options);
1723+
expect(out.min).toEqual([{val: -4, pad: 10, extrapad: false}]);
1724+
expect(out.max).toEqual([{val: 11, pad: 20, extrapad: false}]);
17421725
});
17431726

17441727
it('handles separate pads as number arrays', function() {
@@ -1751,13 +1734,12 @@ describe('Test axes', function() {
17511734
ppadplus: [0, 0, 40, 20]
17521735
};
17531736

1754-
expand(ax, data, options);
1755-
1756-
expect(ax._min).toEqual([
1737+
out = findExtremes(ax, data, options);
1738+
expect(out.min).toEqual([
17571739
{val: 1, pad: 30, extrapad: false},
17581740
{val: -3, pad: 10, extrapad: false}
17591741
]);
1760-
expect(ax._max).toEqual([
1742+
expect(out.max).toEqual([
17611743
{val: 9, pad: 0, extrapad: false},
17621744
{val: 3, pad: 40, extrapad: false},
17631745
{val: 8, pad: 20, extrapad: false}
@@ -1776,70 +1758,49 @@ describe('Test axes', function() {
17761758
ppadplus: 40
17771759
};
17781760

1779-
expand(ax, data, options);
1780-
1781-
expect(ax._min).toEqual([{val: -1, pad: 20, extrapad: false}]);
1782-
expect(ax._max).toEqual([{val: 9, pad: 40, extrapad: false}]);
1761+
out = findExtremes(ax, data, options);
1762+
expect(out.min).toEqual([{val: -1, pad: 20, extrapad: false}]);
1763+
expect(out.max).toEqual([{val: 9, pad: 40, extrapad: false}]);
17831764
});
17841765

17851766
it('adds 5% padding if specified by flag', function() {
17861767
ax = getDefaultAx();
17871768
data = [1, 5];
1788-
options = {
1789-
vpad: 1,
1790-
ppad: 10,
1791-
padded: true
1792-
};
1769+
options = {vpad: 1, ppad: 10, padded: true};
17931770

1794-
expand(ax, data, options);
1795-
1796-
expect(ax._min).toEqual([{val: 0, pad: 10, extrapad: true}]);
1797-
expect(ax._max).toEqual([{val: 6, pad: 10, extrapad: true}]);
1771+
out = findExtremes(ax, data, options);
1772+
expect(out.min).toEqual([{val: 0, pad: 10, extrapad: true}]);
1773+
expect(out.max).toEqual([{val: 6, pad: 10, extrapad: true}]);
17981774
});
17991775

18001776
it('has lower bound zero with all positive data if tozero is sset', function() {
18011777
ax = getDefaultAx();
18021778
data = [2, 5];
1803-
options = {
1804-
vpad: 1,
1805-
ppad: 10,
1806-
tozero: true
1807-
};
1779+
options = {vpad: 1, ppad: 10, tozero: true};
18081780

1809-
expand(ax, data, options);
1810-
1811-
expect(ax._min).toEqual([{val: 0, pad: 0, extrapad: false}]);
1812-
expect(ax._max).toEqual([{val: 6, pad: 10, extrapad: false}]);
1781+
out = findExtremes(ax, data, options);
1782+
expect(out.min).toEqual([{val: 0, pad: 0, extrapad: false}]);
1783+
expect(out.max).toEqual([{val: 6, pad: 10, extrapad: false}]);
18131784
});
18141785

18151786
it('has upper bound zero with all negative data if tozero is set', function() {
18161787
ax = getDefaultAx();
18171788
data = [-7, -4];
1818-
options = {
1819-
vpad: 1,
1820-
ppad: 10,
1821-
tozero: true
1822-
};
1789+
options = {vpad: 1, ppad: 10, tozero: true};
18231790

1824-
expand(ax, data, options);
1825-
1826-
expect(ax._min).toEqual([{val: -8, pad: 10, extrapad: false}]);
1827-
expect(ax._max).toEqual([{val: 0, pad: 0, extrapad: false}]);
1791+
out = findExtremes(ax, data, options);
1792+
expect(out.min).toEqual([{val: -8, pad: 10, extrapad: false}]);
1793+
expect(out.max).toEqual([{val: 0, pad: 0, extrapad: false}]);
18281794
});
18291795

18301796
it('sets neither bound to zero with positive and negative data if tozero is set', function() {
18311797
ax = getDefaultAx();
18321798
data = [-7, 4];
1833-
options = {
1834-
vpad: 1,
1835-
ppad: 10,
1836-
tozero: true
1837-
};
1799+
options = {vpad: 1, ppad: 10, tozero: true};
18381800

1839-
expand(ax, data, options);
1840-
1841-
expect(ax._min).toEqual([{val: -8, pad: 10, extrapad: false}]);
1842-
expect(ax._max).toEqual([{val: 5, pad: 10, extrapad: false}]);
1801+
out = findExtremes(ax, data, options);
1802+
expect(out.min).toEqual([{val: -8, pad: 10, extrapad: false}]);
1803+
expect(out.max).toEqual([{val: 5, pad: 10, extrapad: false}]);
18431804
});
18441805

18451806
it('overrides padded with tozero', function() {
@@ -1852,27 +1813,25 @@ describe('Test axes', function() {
18521813
padded: true
18531814
};
18541815

1855-
expand(ax, data, options);
1856-
1857-
expect(ax._min).toEqual([{val: 0, pad: 0, extrapad: false}]);
1858-
expect(ax._max).toEqual([{val: 6, pad: 10, extrapad: true}]);
1816+
out = findExtremes(ax, data, options);
1817+
expect(out.min).toEqual([{val: 0, pad: 0, extrapad: false}]);
1818+
expect(out.max).toEqual([{val: 6, pad: 10, extrapad: true}]);
18591819
});
18601820

18611821
it('should fail if no data is given', function() {
18621822
ax = getDefaultAx();
1863-
expect(function() { expand(ax); }).toThrow();
1823+
expect(function() { findExtremes(ax); }).toThrow();
18641824
});
18651825

18661826
it('should return even if `autorange` is false', function() {
18671827
ax = getDefaultAx();
1868-
data = [2, 5];
1869-
18701828
ax.autorange = false;
18711829
ax.rangeslider = { autorange: false };
1830+
data = [2, 5];
18721831

1873-
expand(ax, data, {});
1874-
expect(ax._min).toEqual([{val: 2, pad: 0, extrapad: false}]);
1875-
expect(ax._max).toEqual([{val: 5, pad: 0, extrapad: false}]);
1832+
out = findExtremes(ax, data, {});
1833+
expect(out.min).toEqual([{val: 2, pad: 0, extrapad: false}]);
1834+
expect(out.max).toEqual([{val: 5, pad: 0, extrapad: false}]);
18761835
});
18771836
});
18781837

‎test/jasmine/tests/contour_test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ describe('contour calc', function() {
186186

187187
supplyAllDefaults(gd);
188188
var fullTrace = gd._fullData[0];
189+
fullTrace._extremes = {};
189190

190191
var out = Contour.calc(gd, fullTrace)[0];
191192
out.trace = fullTrace;

‎test/jasmine/tests/heatmap_test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ describe('heatmap calc', function() {
301301
var fullTrace = gd._fullData[0];
302302
var fullLayout = gd._fullLayout;
303303

304+
fullTrace._extremes = {};
305+
304306
var out = Heatmap.calc(gd, fullTrace)[0];
305307
out._xcategories = fullLayout.xaxis._categories;
306308
out._ycategories = fullLayout.yaxis._categories;

0 commit comments

Comments
 (0)