StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

improve worksheet test coverage

Browse Source
This commit is contained in:
Thomas Fussell 2016-06-23 09:33:10 +01:00
parent 4dae9438fb
commit c7bc216026
4 changed files with 186 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/xlnt/worksheet/worksheet.hpp
View File

@ -159,8 +159,6 @@ public:
void append();
void append(const std::vector<std::string> &cells);
void append(const std::vector<int> &cells);
void append(const std::vector<date> &cells);
void append(const std::vector<cell> &cells);
void append(const std::unordered_map<std::string, std::string> &cells);
void append(const std::unordered_map<int, std::string> &cells);

3
source/workbook/tests/test_workbook.hpp
View File

@ -38,8 +38,11 @@ public:
{
xlnt::workbook wb;
auto new_sheet = wb.create_sheet();
new_sheet.get_cell("A6").set_value(1.498);
wb.add_sheet(new_sheet);
TS_ASSERT(wb[1].compare(wb[2], false));
wb.create_sheet().get_cell("A6").set_value(1.497);
TS_ASSERT(!wb[1].compare(wb[3], false));
}
// void test_add_sheetname() {} unnecessary

172
source/worksheet/tests/test_worksheet.hpp
View File

@ -195,6 +195,12 @@ public:
TS_ASSERT_EQUALS(1, xlrange.length());
TS_ASSERT_EQUALS(1, xlrange[0].num_cells());
TS_ASSERT_EQUALS(5, xlrange[0][0].get_row());
ws.create_named_range("test_range2", "C6");
auto xlrange2 = ws.get_named_range("test_range2");
TS_ASSERT_EQUALS(1, xlrange2.length());
TS_ASSERT_EQUALS(1, xlrange2[0].num_cells());
TS_ASSERT_EQUALS(6, xlrange2[0][0].get_row());
}
void test_get_bad_named_range()
@ -215,6 +221,13 @@ public:
TS_ASSERT_THROWS(ws2.get_named_range("wrong_sheet_range"), xlnt::named_range_exception);
}
void test_remove_named_range_bad()
{
xlnt::workbook wb;
xlnt::worksheet ws(wb);
TS_ASSERT_THROWS(ws.remove_named_range("bad_range"), std::runtime_error);
}
void test_cell_alternate_coordinates()
{
xlnt::workbook wb;
@ -490,6 +503,7 @@ public:
{
xlnt::workbook wb;
xlnt::worksheet ws(wb);
ws.get_cell("A2").set_value("test");
ws.merge_cells("A1:N50");
auto all_merged = ws.get_merged_ranges();
TS_ASSERT_EQUALS(all_merged.size(), 1);
@ -529,6 +543,14 @@ public:
TS_ASSERT_EQUALS(ws.get_merged_ranges(), expected);
}
void test_unmerge_bad()
{
xlnt::workbook wb;
xlnt::worksheet ws(wb);
TS_ASSERT_THROWS(ws.unmerge_cells("A1:D3"), std::runtime_error);
}
void test_unmerge_range_string()
{
xlnt::workbook wb;
@ -944,4 +966,154 @@ public:
TS_ASSERT_EQUALS(ws.get_page_setup().get_scale(), 1.23);
TS_ASSERT(!ws.get_page_setup().is_default());
}
void test_unique_sheet_name()
{
xlnt::workbook wb;
auto ws = wb.get_active_sheet();
auto active_name = ws.get_title();
auto next_name = ws.unique_sheet_name(active_name);
TS_ASSERT_DIFFERS(active_name, next_name);
}
void test_page_margins()
{
xlnt::workbook wb;
auto ws = wb.get_active_sheet();
ws.get_page_margins();
//TODO: uhh... this isn't a test
}
void test_to_string()
{
xlnt::workbook wb;
auto ws = wb.get_active_sheet();
auto ws_string = ws.to_string();
TS_ASSERT_EQUALS(ws_string, "<Worksheet \"Sheet\">");
}
void test_garbage_collect()
{
xlnt::workbook wb;
auto ws = wb.get_active_sheet();
auto dimensions = ws.calculate_dimension();
TS_ASSERT_EQUALS(dimensions, xlnt::range_reference("A1", "A1"));
ws.get_cell("B2").set_value("text");
ws.garbage_collect();
dimensions = ws.calculate_dimension();
TS_ASSERT_EQUALS(dimensions, xlnt::range_reference("B2", "B2"));
}
void test_get_title_bad()
{
xlnt::worksheet ws;
TS_ASSERT_THROWS(ws.get_title(), std::runtime_error);
}
void test_has_cell()
{
xlnt::workbook wb;
auto ws = wb.get_active_sheet();
ws.get_cell("A3").set_value("test");
TS_ASSERT(!ws.has_cell("A2"));
TS_ASSERT(ws.has_cell("A3"));
}
void test_get_range_by_string()
{
xlnt::workbook wb;
auto ws = wb.get_active_sheet();
ws.get_cell("A2").set_value(3.14);
ws.get_cell("B3").set_value(false);
auto range = ws.get_range("A2:B3");
TS_ASSERT_EQUALS((*(*range.begin()).begin()).get_value<double>(), 3.14);
TS_ASSERT_EQUALS((*(--(*(--range.end())).end())).get_value<double>(), false);
}
void test_get_squared_range()
{
xlnt::workbook wb;
auto ws = wb.get_active_sheet();
ws.get_cell("A2").set_value(3.14);
ws.get_cell("B3").set_value(false);
auto range = ws.get_squared_range(1, 2, 2, 3);
TS_ASSERT_EQUALS((*(*range.begin()).begin()).get_value<double>(), 3.14);
TS_ASSERT_EQUALS((*(--(*(--range.end())).end())).get_value<double>(), false);
}
void test_operators()
{
xlnt::workbook wb;
wb.create_sheet();
wb.create_sheet();
auto ws1 = wb[1];
auto ws2 = wb[2];
TS_ASSERT_DIFFERS(ws1, ws2);
ws1[xlnt::cell_reference("A2")].set_value(true);
const auto ws1_const = ws1;
TS_ASSERT_EQUALS(ws1[xlnt::cell_reference("A2")].get_value<bool>(), true);
TS_ASSERT_EQUALS((*(*ws1[xlnt::range_reference("A2:A2")].begin()).begin()).get_value<bool>(), true);
ws1.create_named_range("rangey", "A2:A2");
TS_ASSERT_EQUALS(ws1[std::string("rangey")], ws1.get_range("A2:A2"));
TS_ASSERT_EQUALS(ws1[std::string("A2:A2")], ws1.get_range("A2:A2"));
}
void test_reserve()
{
xlnt::workbook wb;
xlnt::worksheet ws(wb);
ws.reserve(1000);
//TODO: actual tests go here
}
void test_iterate()
{
xlnt::workbook wb;
xlnt::worksheet ws(wb);
ws.get_cell("B3").set_value("B3");
ws.get_cell("C7").set_value("C7");
for (auto row : ws)
{
for (auto cell : row)
{
if (cell.has_value())
{
TS_ASSERT_EQUALS(cell.get_reference().to_string(), cell.get_value<std::string>());
}
}
}
const auto ws_const = ws;
for (auto row : ws_const)
{
for (auto cell : row)
{
if (cell.has_value())
{
TS_ASSERT_EQUALS(cell.get_reference().to_string(), cell.get_value<std::string>());
}
}
}
}
};

32
source/worksheet/worksheet.cpp
View File

@ -559,28 +559,6 @@ void worksheet::append(const std::vector<int> &cells)
}
}
void worksheet::append(const std::vector<date> &cells)
{
xlnt::cell_reference next(1, get_next_row());
for (const auto &cell : cells)
{
get_cell(next).set_value(cell);
next.set_column_index(next.get_column_index() + 1);
}
}
void worksheet::append(const std::vector<cell> &cells)
{
xlnt::cell_reference next(1, get_next_row());
for (auto cell : cells)
{
get_cell(next).set_value(cell);
next.set_column_index(next.get_column_index() + 1);
}
}
void worksheet::append(const std::unordered_map<std::string, std::string> &cells)
{
auto row = get_next_row();
@ -667,7 +645,15 @@ bool worksheet::compare(const worksheet &other, bool reference) const
return false;
}
if(!(cell.second.self() == other.d_->cell_map_[row.first][cell.first].self()))
auto this_cell = cell.second.self();
auto other_cell = other.d_->cell_map_[row.first][cell.first].self();
if (this_cell.get_data_type() != other_cell.get_data_type())
{
return false;
}
if (this_cell.get_data_type() == xlnt::cell::type::numeric && this_cell.get_value<long double>() != other_cell.get_value<long double>())
{
return false;
}