openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

vector2d: few more tests

Browse Source
This commit is contained in:
Celtic Minstrel
2023-01-18 09:53:19 -05:00
parent 2492610ec7
commit 20102c7f52
2 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/tools/vector2d.hpp
View File

@@ -163,6 +163,36 @@ public:
const Type& operator()(size_t x, size_t y) const {
return (*this)[x][y];
}
Type& top_left() {
return (*this)[0][0];
}
const Type& top_left() const {
return (*this)[0][0];
}
Type& top_right() {
return (*this)[0][h - 1];
}
const Type& top_right() const {
return (*this)[0][h - 1];
}
Type& bottom_left() {
return (*this)[w - 1][0];
}
const Type& bottom_left() const {
return (*this)[h - 1][0];
}
Type& bottom_right() {
return (*this)[w - 1][w - 1];
}
const Type& bottom_right() const {
return (*this)[h - 1][w - 1];
}
Type& centre() {
return (*this)[w / 2][h / 2];
}
const Type& centre() const {
return (*this)[w / 2][h / 2];
}
size_t width() const {
return w;
}

40
test/vector2d.cpp
View File

@@ -13,8 +13,16 @@ TEST_CASE("vector2d") {
SECTION("default construct") {
CHECK(test_vector.width() == 0);
CHECK(test_vector.height() == 0);
CHECK(test_vector.size() == 0);
CHECK(test_vector.empty());
}
test_vector.resize(5, 5);
SECTION("resize changes size") {
CHECK(test_vector.width() == 5);
CHECK(test_vector.height() == 5);
CHECK(test_vector.size() == 25);
CHECK_FALSE(test_vector.empty());
}
SECTION("assignment") {
SECTION("by call") {
test_vector(3,4) = 12;
@@ -32,6 +40,18 @@ TEST_CASE("vector2d") {
test_vector.col(3)[4] = 12;
CHECK(test_vector(3,4) == 12);
}
SECTION("by name") {
test_vector.top_left() = 1;
test_vector.top_right() = 2;
test_vector.bottom_left() = 3;
test_vector.bottom_right() = 4;
test_vector.centre() = 5;
CHECK(test_vector(0,0) == 1);
CHECK(test_vector(0,4) == 2);
CHECK(test_vector(4,0) == 3);
CHECK(test_vector(4,4) == 4);
CHECK(test_vector(2,2) == 5);
}
SECTION("by row") {
test_vector.row(4) = {1, 2, 3, 4, 5};
CHECK(test_vector(0,4) == 1);
@@ -49,6 +69,26 @@ TEST_CASE("vector2d") {
CHECK(test_vector(4,4) == 5);
}
}
SECTION("access") {
test_vector(3,4) = 12;
test_vector(1,2) = 9;
SECTION("by call") {
CHECK(test_vector(3,4) == 12);
CHECK(test_vector(1,2) == 9);
}
SECTION("by index") {
CHECK(test_vector[3][4] == 12);
CHECK(test_vector[1][2] == 9);
}
SECTION("by row and colum") {
CHECK(test_vector.row(4)[3] == 12);
CHECK(test_vector.row(2)[1] == 9);
}
SECTION("by column and row") {
CHECK(test_vector.col(3)[4] == 12);
CHECK(test_vector.col(1)[2] == 9);
}
}
}
static void fill_some_values(vector2d<int>& tv) {