Skip to content

Commit

Permalink
fixing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@pat310
pat310 committed Nov 8, 2017
1 parent 2066a38 commit 2e35ab9
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 1 deletion.
12 changes: 12 additions & 0 deletions test/index/collapse.js
View file
Expand Up @@ -62,6 +62,10 @@ export default () => {
type: 'rowHeader',
row: 5,
},
{
type: 'aggregated',
value: ['', 44, 56, 133],
},
];

const expectedRawData = [
Expand Down Expand Up @@ -149,6 +153,10 @@ export default () => {
type: 'rowHeader',
row: 5,
},
{
type: 'aggregated',
value: ['', 44, 56, 133],
},
];

expect(pivot.data.table).to.deep.equal(expectedTable);
Expand Down Expand Up @@ -182,6 +190,10 @@ export default () => {
type: 'rowHeader',
row: 5,
},
{
type: 'aggregated',
value: ['', 44, 56, 133],
},
];

expect(pivot.data.table).to.deep.equal(expectedTable);
Expand Down
8 changes: 8 additions & 0 deletions test/index/expand.js
View file
Expand Up @@ -89,6 +89,10 @@ export default () => {
depth: 0,
type: 'rowHeader',
row: 5 },
{
type: 'aggregated',
value: ['', 44, 56, 133],
},
];

const expectedCollapsedResult = [
Expand Down Expand Up @@ -244,6 +248,10 @@ export default () => {
depth: 0,
row: 10,
},
{
type: 'aggregated',
value: ['', 22, 22, 38, 18, 133],
},
];

expect(pivot.data.table).to.deep.equal(expectedTable);
Expand Down
8 changes: 8 additions & 0 deletions test/index/filter.js
View file
Expand Up @@ -60,6 +60,7 @@ export default () => {
{ value: [ 'Sansa', 12 ], type: 'data', depth: 2, row: 14 },
{ value: [ 'm', 8 ], depth: 1, type: 'rowHeader', row: 15 },
{ value: [ 'Bran', 8 ], type: 'data', depth: 2, row: 16 },
{ type: 'aggregated', value: ['', 219] },
];

pivot.filter('name', ['Jon'], 'exclude');
Expand Down Expand Up @@ -103,6 +104,7 @@ export default () => {
{ value: [ 'Sansa', 12 ], type: 'data', depth: 2, row: 14 },
{ value: [ 'm', 8 ], depth: 1, type: 'rowHeader', row: 15 },
{ value: [ 'Bran', 8 ], type: 'data', depth: 2, row: 16 },
{type: 'aggregated', value: ['', 219] },
];

pivot.filter('name', ['Jon']);
Expand All @@ -128,6 +130,7 @@ export default () => {
{ value: [ 'm', 22 ], depth: 1, type: 'rowHeader', row: 5 },
{ value: [ 'Bran', 8 ], type: 'data', depth: 2, row: 6 },
{ value: [ 'Jon', 14 ], type: 'data', depth: 2, row: 7 },
{ type: 'aggregated', value: ['', 44] },
];

function filterFunc(dataRow) {
Expand Down Expand Up @@ -166,6 +169,7 @@ export default () => {
row: 6 },
{ value: [ 'm', 133 ], depth: 1, type: 'rowHeader', row: 7 },
{ value: [ 'Stark', 30 ], depth: 0, type: 'rowHeader', row: 11 },
{ type: 'aggregated', value: ['', 219] },
];

pivot.collapse(11).collapse(2).collapse(6);
Expand All @@ -187,6 +191,7 @@ export default () => {
const expectedResult = [
{ value: [ 'sum age', 'sum age' ], depth: 0, type: 'colHeader', row: 0 },
{ value: [ 'Stark', 44 ], depth: 0, type: 'rowHeader', row: 1 },
{ type: 'aggregated', value: ['', 44] },
];

function filterFunc(dataRow) {
Expand Down Expand Up @@ -214,6 +219,7 @@ export default () => {
{ value: [ 'Baratheon', 38 ], depth: 0, type: 'rowHeader', row: 1 },
{ value: [ 'f', 38 ], depth: 1, type: 'rowHeader', row: 2 },
{ value: [ 'Cersei', 38 ], type: 'data', depth: 2, row: 3 },
{ type: 'aggregated', value: ['', 38] },
];

pivot.filter('house', ['Stark'], 'exclude')
Expand Down Expand Up @@ -254,6 +260,7 @@ export default () => {
{ value: [ 'm', 22 ], depth: 1, type: 'rowHeader', row: 11 },
{ value: [ 'Bran', 8 ], type: 'data', depth: 2, row: 12 },
{ value: [ 'Jon', 14 ], type: 'data', depth: 2, row: 13 },
{ type: 'aggregated', value: ['', 96] },
];

pivot.filter('name', ['Cersei'], 'exclude')
Expand Down Expand Up @@ -298,6 +305,7 @@ export default () => {
{ value: [ 'm', 22 ], depth: 1, type: 'rowHeader', row: 11 },
{ value: [ 'Bran', 8 ], type: 'data', depth: 2, row: 12 },
{ value: [ 'Jon', 14 ], type: 'data', depth: 2, row: 13 },
{ type: 'aggregated', value: ['', 96] },
];

pivot.filter('name', ['Cersei'], 'exclude')
Expand Down
1 change: 1 addition & 0 deletions test/index/update.js
View file
Expand Up @@ -37,6 +37,7 @@ export default () => {
{ value: [ 'Jaime', '', 32, '' ], type: 'data', depth: 1, row: 5 },
{ value: [ 'Joffrey', '', '', 18 ], type: 'data', depth: 1, row: 6 },
{ value: [ 'Tyrion', '', 34, '' ], type: 'data', depth: 1, row: 7 },
{ type: 'aggregated', value: ['', 20, 66, 18] },
];

const pivot = new Pivot(
Expand Down
9 changes: 8 additions & 1 deletion test/logic/tableCreator.js
View file
Expand Up @@ -52,6 +52,7 @@ export default () => {
type: 'data',
depth: 0,
},
{ type: 'aggregated', value: ['', 3, 3, 2] },
];
const expectedRawDataResults = [
{
Expand Down Expand Up @@ -144,6 +145,7 @@ export default () => {
depth: 0,
type: 'data',
},
{ type: 'aggregated', value: ['', 3, 3, 2] },
];
const expectedRawDataResults = [
{
Expand Down Expand Up @@ -221,6 +223,7 @@ export default () => {
depth: 0,
type: 'data',
},
{ type: 'aggregated', value: ['', 3, 3, 2] },
];

expect(tableResults.table).to.deep.equal(expectedTableResults);
Expand Down Expand Up @@ -256,6 +259,7 @@ export default () => {
depth: 0,
type: 'data',
},
{ type: 'aggregated', value: ['', 8] },
];

expect(tableResults.table).to.deep.equal(expectedTableResults);
Expand All @@ -278,6 +282,7 @@ export default () => {
depth: 0,
type: 'data',
},
{ type: 'aggregated', value: [''] },
];

expect(tableResults.table).to.deep.equal(expectedTableResults);
Expand All @@ -298,6 +303,7 @@ export default () => {
depth: 0,
type: 'data',
},
{ type: 'aggregated', value: [''] },
];

expect(tableResults.table).to.deep.equal(expectedTableResults);
Expand Down Expand Up @@ -329,6 +335,7 @@ export default () => {
{ value: [ 'm', 1 ], type: 'data', depth: 1, row: 6 },
{ value: [ 'Lannister', 3 ], depth: 0, type: 'rowHeader', row: 7 },
{ value: [ 'm', 3 ], type: 'data', depth: 1, row: 8 },
{ type: 'aggregated', value: ['', 9] },
];

expect(tableResults.table).to.deep.equal(expectedResults);
Expand All @@ -354,7 +361,7 @@ export default () => {
const results = tableCreator(dataEmptyStrings, ['house', 'name'], [], 'age',
'sum');

const expectedResults = '[{"value":["sum age","sum age"],"depth":0,"type":"colHeader","row":0},{"value":["Stark",44],"depth":0,"type":"rowHeader","row":1},{"value":["Jon",14],"type":"data","depth":1,"row":2},{"value":["",10],"type":"data","depth":1,"row":3},{"value":["Bran",8],"type":"data","depth":1,"row":4},{"value":["Sansa",12],"type":"data","depth":1,"row":5},{"value":["Baratheon",56],"depth":0,"type":"rowHeader","row":6},{"value":["Cersei",38],"type":"data","depth":1,"row":7},{"value":["Joffrey",18],"type":"data","depth":1,"row":8},{"value":["Lannister",133],"depth":0,"type":"rowHeader","row":9},{"value":["",67],"type":"data","depth":1,"row":10},{"value":["Tyrion",34],"type":"data","depth":1,"row":11},{"value":["Jaime",32],"type":"data","depth":1,"row":12}]'; // eslint-disable-line max-len
const expectedResults = '[{"value":["sum age","sum age"],"depth":0,"type":"colHeader","row":0},{"value":["Stark",44],"depth":0,"type":"rowHeader","row":1},{"value":["Jon",14],"type":"data","depth":1,"row":2},{"value":["",10],"type":"data","depth":1,"row":3},{"value":["Bran",8],"type":"data","depth":1,"row":4},{"value":["Sansa",12],"type":"data","depth":1,"row":5},{"value":["Baratheon",56],"depth":0,"type":"rowHeader","row":6},{"value":["Cersei",38],"type":"data","depth":1,"row":7},{"value":["Joffrey",18],"type":"data","depth":1,"row":8},{"value":["Lannister",133],"depth":0,"type":"rowHeader","row":9},{"value":["",67],"type":"data","depth":1,"row":10},{"value":["Tyrion",34],"type":"data","depth":1,"row":11},{"value":["Jaime",32],"type":"data","depth":1,"row":12},{"value":["",233],"type":"aggregated"}]'; // eslint-disable-line max-len

expect(expectedResults).to.equal(JSON.stringify(results.table));
});
Expand Down

0 comments on commit 2e35ab9

Please sign in to comment.