summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/cache.cc31
-rw-r--r--tests/logger.cc65
2 files changed, 7 insertions, 89 deletions
diff --git a/tests/cache.cc b/tests/cache.cc
index 8d1e806..e8a257f 100644
--- a/tests/cache.cc
+++ b/tests/cache.cc
@@ -27,7 +27,6 @@ TEST_CASE("no delay stores instantly", "[cache]")
r = c->write(MEM, w, 0b0);
CHECK(r == OK);
- d->resolve();
c->resolve();
actual = d->view(0, 1)[0];
@@ -38,7 +37,6 @@ TEST_CASE("no delay stores instantly", "[cache]")
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
- delete d;
delete c;
}
@@ -62,12 +60,10 @@ TEST_CASE("cache takes \"forever\"", "[cache]")
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
c->resolve();
- d->resolve();
}
r = c->write(MEM, w, 0b0);
CHECK(r == OK);
- d->resolve();
actual = d->view(0, 1)[0];
// we do NOT write back now!
@@ -77,7 +73,6 @@ TEST_CASE("cache takes \"forever\"", "[cache]")
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
- delete d;
delete c;
}
@@ -101,12 +96,10 @@ TEST_CASE("dram takes \"forever\"", "[cache]")
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
c->resolve();
- d->resolve();
}
r = c->write(MEM, w, 0b0);
CHECK(r == OK);
- d->resolve();
actual = d->view(0, 1)[0];
// we do NOT write back now!
@@ -116,7 +109,6 @@ TEST_CASE("dram takes \"forever\"", "[cache]")
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
- delete d;
delete c;
}
@@ -140,7 +132,6 @@ TEST_CASE("dram and cache take \"forever\"", "[cache]")
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
c->resolve();
- d->resolve();
}
for (i = 0; i < delay; ++i) {
@@ -150,13 +141,11 @@ TEST_CASE("dram and cache take \"forever\"", "[cache]")
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
c->resolve();
- d->resolve();
}
r = c->write(MEM, w, 0b0);
CHECK(r == OK);
c->resolve();
- d->resolve();
actual = d->view(0, 1)[0];
// we do NOT write back now!
@@ -166,11 +155,11 @@ TEST_CASE("dram and cache take \"forever\"", "[cache]")
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
- delete d;
delete c;
}
-TEST_CASE("dram takes \"forever\", two concurrent requests same index", "[cache]")
+TEST_CASE(
+ "dram takes \"forever\", two concurrent requests same index", "[cache]")
{
int delay = 0;
Dram *d = new Dram(MEM_SIZE, delay + 2);
@@ -193,7 +182,6 @@ TEST_CASE("dram takes \"forever\", two concurrent requests same index", "[cache]
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
c->resolve();
- d->resolve();
}
r = c->write(MEM, w, 0b0);
@@ -202,7 +190,6 @@ TEST_CASE("dram takes \"forever\", two concurrent requests same index", "[cache]
CHECK(r == WAIT);
c->resolve();
- d->resolve();
actual = d->view(0, 1)[0];
// we do NOT write back now!
@@ -217,17 +204,17 @@ TEST_CASE("dram takes \"forever\", two concurrent requests same index", "[cache]
CHECK(r == OK);
c->resolve();
- d->resolve();
expected.at(1) = w;
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
- delete d;
delete c;
}
-TEST_CASE("dram takes \"forever\", two concurrent requests different index", "[cache]")
+TEST_CASE(
+ "dram takes \"forever\", two concurrent requests different index",
+ "[cache]")
{
int delay = 0;
Dram *d = new Dram(MEM_SIZE, delay + 2);
@@ -250,7 +237,6 @@ TEST_CASE("dram takes \"forever\", two concurrent requests different index", "[c
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
c->resolve();
- d->resolve();
}
r = c->write(MEM, w, 0b0);
@@ -259,7 +245,6 @@ TEST_CASE("dram takes \"forever\", two concurrent requests different index", "[c
CHECK(r == WAIT);
c->resolve();
- d->resolve();
actual = d->view(0, 1)[0];
// we do NOT write back now!
@@ -276,24 +261,22 @@ TEST_CASE("dram takes \"forever\", two concurrent requests different index", "[c
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
c->resolve();
- d->resolve();
}
r = c->write(FETCH, w, 0b1);
CHECK(r == OK);
c->resolve();
- d->resolve();
expected.at(1) = w;
actual = c->view(0, 1)[0];
REQUIRE(expected == actual);
- delete d;
delete c;
}
-TEST_CASE("dram takes \"forever\", two concurrent requests different tag", "[cache]")
+TEST_CASE(
+ "dram takes \"forever\", two concurrent requests different tag", "[cache]")
{
// TODO
}
diff --git a/tests/logger.cc b/tests/logger.cc
deleted file mode 100644
index 711dd0e..0000000
--- a/tests/logger.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "logger.h"
-#include <catch2/catch_test_macros.hpp>
-#include <iostream>
-#include <regex>
-#include <sstream>
-
-TEST_CASE("Logger logs higher log level", "[logger]")
-{
- std::streambuf *coutBuffer = std::cout.rdbuf();
- std::ostringstream oss;
- std::cout.rdbuf(oss.rdbuf());
-
- Logger logger("");
- logger.setLevel(INFO);
-
- logger.log(ERROR, "foo bar baz qux");
-
- std::cout.rdbuf(coutBuffer);
-
- std::string actual = oss.str();
- std::regex expected(
- "\\[\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\] ERROR: "
- "foo bar baz qux\\n");
-
- REQUIRE(std::regex_match(actual, expected));
-}
-
-TEST_CASE("Logger logs equal log level", "[logger]")
-{
- std::streambuf *coutBuffer = std::cout.rdbuf();
- std::ostringstream oss;
- std::cout.rdbuf(oss.rdbuf());
-
- Logger logger("");
- logger.setLevel(INFO);
-
- logger.log(INFO, "foo bar baz qux");
-
- std::cout.rdbuf(coutBuffer);
-
- std::string actual = oss.str();
- std::regex expected("\\[\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\] INFO: "
- "foo bar baz qux\\n");
-
- REQUIRE(std::regex_match(actual, expected));
-}
-
-TEST_CASE("Logger ignores lower log level", "[logger]")
-{
- std::streambuf *coutBuffer = std::cout.rdbuf();
- std::ostringstream oss;
- std::cout.rdbuf(oss.rdbuf());
-
- Logger logger("");
- logger.setLevel(INFO);
-
- logger.log(DEBUG, "foo bar baz qux");
-
- std::cout.rdbuf(coutBuffer);
-
- std::string actual = oss.str();
- std::string expected("");
-
- REQUIRE(actual == expected);
-}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-13 11:59:45 +0000