[ox/std] Cleanup tests

This commit is contained in:
Gary Talent 2021-05-15 01:41:50 -05:00
parent 314b177666
commit 56269004d7

View File

@ -17,10 +17,12 @@ std::map<std::string, std::function<ox::Error()>> tests = {
{ {
"malloc", "malloc",
[] { [] {
ox::Vector<char> buff(ox::units::MB); ox::Buffer buff(ox::units::MB);
ox::heapmgr::initHeap(&buff[0], &buff[buff.size()-1]); ox::heapmgr::initHeap(&buff[0], &buff[buff.size()-1]);
oxAssert(ox::heapmgr::malloc(5) != nullptr, "malloc is broken"); auto a1 = ox::bit_cast<char*>(ox::heapmgr::malloc(5));
oxAssert(ox::heapmgr::malloc(5) != nullptr, "malloc is broken"); auto a2 = ox::bit_cast<char*>(ox::heapmgr::malloc(5));
oxAssert(a1 >= &buff.front().value && a1 < &buff.back().value, "malloc is broken");
oxAssert(a2 >= &buff.front().value && a2 < &buff.back().value && a2 > a1 + 5, "malloc is broken");
return OxError(0); return OxError(0);
} }
}, },
@ -89,12 +91,13 @@ std::map<std::string, std::function<ox::Error()>> tests = {
oxAssert(v.size() == 0, "Initial Vector size not 0"); oxAssert(v.size() == 0, "Initial Vector size not 0");
auto insertTest = [&v](int val, [[maybe_unused]] std::size_t size) { auto insertTest = [&v](int val, [[maybe_unused]] std::size_t size) {
v.push_back(val); v.push_back(val);
oxAssert(v.size() == size, "Vector size incorrect"); oxReturnError(OxError(v.size() != size, "Vector size incorrect"));
oxAssert(v[v.size() - 1] == val, "Vector value wrong"); oxReturnError(OxError(v[v.size() - 1] != val, "Vector value wrong"));
return OxError(0);
}; };
insertTest(42, 1); oxAssert(insertTest(42, 1), "Vector insertion failed");
insertTest(100, 2); oxAssert(insertTest(100, 2), "Vector insertion failed");
insertTest(102, 3); oxAssert(insertTest(102, 3), "Vector insertion failed");
return OxError(0); return OxError(0);
} }
}, },