From dec9ac553bcd4a4b0ed71c3d2f47ff09123538f1 Mon Sep 17 00:00:00 2001 From: Max Guglielmi Date: Fri, 31 Jul 2015 16:41:35 +1000 Subject: [PATCH] Fixed tests for data retrieval for test-api --- dist/tablefilter/tablefilter.js | 2 +- dist/tablefilter/tf-1.js | 2 +- test/test-api.js | 85 +++++++++++++++++---------------- 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dist/tablefilter/tablefilter.js b/dist/tablefilter/tablefilter.js index 7ef75f19..cbfc171b 100644 --- a/dist/tablefilter/tablefilter.js +++ b/dist/tablefilter/tablefilter.js @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-07-30T07:19:59.670Z + * build date: 2015-07-31T06:39:40.127Z * MIT License */ diff --git a/dist/tablefilter/tf-1.js b/dist/tablefilter/tf-1.js index 69cf81b2..7c1a760e 100644 --- a/dist/tablefilter/tf-1.js +++ b/dist/tablefilter/tf-1.js @@ -1,6 +1,6 @@ /** * TableFilter v0.0.0 by Max Guglielmi - * build date: 2015-07-30T07:19:59.670Z + * build date: 2015-07-31T06:39:40.127Z * MIT License */ diff --git a/test/test-api.js b/test/test-api.js index 6e1dca0f..bed6dccc 100644 --- a/test/test-api.js +++ b/test/test-api.js @@ -241,48 +241,49 @@ ], 'Get specified column values' ); - // deepEqual( - // tf.getTableData(), - // [ - // [0, ['Sydney','Adelaide','1412','1.4','25.3']], - // [1, ['Sydney','Brisbane','982','1.5','16']], - // [2, ['Sydney','Canberra','286','.6','4.3']], - // [3, ['Sydney','Melbourne','872','1.1','10.5']], - // [4, ['Adelaide','Perth','2781','3.1','38']], - // [5, ['Adelaide','Alice Springs','1533','2','20.25']], - // [6, ['Adelaide','Brisbane','2045','2.15','40']] - // ], - // 'Get table data' - // ); - // tf.setFilterValue(0, 'Adelaide'); - // tf.filter(); - // deepEqual( - // tf.getFilteredData(), - // [ - // [6, ['Adelaide','Perth','2781','3.1','38']], - // [7, ['Adelaide','Alice Springs','1533','2','20.25']], - // [8, ['Adelaide','Brisbane','2045','2.15','40']] - // ], - // 'Get filtered table data' - // ); - // deepEqual( - // tf.getFilteredData(true), - // [ - // [1, ['From','Destination','Road Distance (km)', - // 'By Air (hrs)','By Rail (hrs)']], - // [6, ['Adelaide','Perth','2781','3.1','38']], - // [7, ['Adelaide','Alice Springs','1533','2','20.25']], - // [8, ['Adelaide','Brisbane','2045','2.15','40']] - // ], - // 'Get filtered table data including columns headers' - // ); - // deepEqual( - // tf.getFilteredDataCol(0), - // ['Adelaide','Adelaide','Adelaide'], - // 'Get specified column filtered values' - // ); - // tf.clearFilters(); - // tf.filter(); + deepEqual( + tf.getTableData(), + [ + [0, ['Sydney','Adelaide','1412','1.4','25.3']], + [1, ['Sydney','Brisbane','982','1.5','16']], + [2, ['Sydney','Canberra','286','.6','4.3']], + [3, ['Sydney','Melbourne','872','1.1','10.5']], + [4, ['Adelaide','Perth','2781','3.1','38']], + [5, ['Adelaide','Alice Springs','1533','2','20.25']], + [6, ['Adelaide','Brisbane','2045','2.15','40']] + ], + 'Get table data' + ); + tf.clearFilters(); + tf.setFilterValue(0, 'Adelaide'); + tf.filter(); + deepEqual( + tf.getFilteredData(), + [ + [4, ['Adelaide','Perth','2781','3.1','38']], + [5, ['Adelaide','Alice Springs','1533','2','20.25']], + [6, ['Adelaide','Brisbane','2045','2.15','40']] + ], + 'Get filtered table data' + ); + deepEqual( + tf.getFilteredData(true), + [ + [0, ['From','Destination','Road Distance (km)', + 'By Air (hrs)','By Rail (hrs)']], + [4, ['Adelaide','Perth','2781','3.1','38']], + [5, ['Adelaide','Alice Springs','1533','2','20.25']], + [6, ['Adelaide','Brisbane','2045','2.15','40']] + ], + 'Get filtered table data including columns headers' + ); + deepEqual( + tf.getFilteredDataCol(0), + ['Adelaide','Adelaide','Adelaide'], + 'Get specified column filtered values' + ); + tf.clearFilters(); + tf.filter(); }); test('Destroy', function() {