diff options
Diffstat (limited to 'test/tasks_test.cc')
| -rw-r--r-- | test/tasks_test.cc | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/test/tasks_test.cc b/test/tasks_test.cc index 2e0ffc7..f74ef37 100644 --- a/test/tasks_test.cc +++ b/test/tasks_test.cc @@ -93,17 +93,17 @@ public: using namespace std::string_literals; Settings settings{}; const auto& targets = getTargets(settings); - uASSERT_EQUAL(4u, targets.size()); + uUNIT_ASSERT_EQUAL(4u, targets.size()); - uASSERT_EQUAL("target1"s, targets[0].config.target); - uASSERT_EQUAL("target2"s, targets[1].config.target); - uASSERT_EQUAL("target3"s, targets[2].config.target); - uASSERT_EQUAL("target4"s, targets[3].config.target); + uUNIT_ASSERT_EQUAL("target1"s, targets[0].config.target); + uUNIT_ASSERT_EQUAL("target2"s, targets[1].config.target); + uUNIT_ASSERT_EQUAL("target3"s, targets[2].config.target); + uUNIT_ASSERT_EQUAL("target4"s, targets[3].config.target); - uASSERT_EQUAL("test"s, targets[0].path); - uASSERT_EQUAL("test"s, targets[1].path); - uASSERT_EQUAL("test"s, targets[2].path); - uASSERT_EQUAL("test"s, targets[3].path); + uUNIT_ASSERT_EQUAL("test"s, targets[0].path); + uUNIT_ASSERT_EQUAL("test"s, targets[1].path); + uUNIT_ASSERT_EQUAL("test"s, targets[2].path); + uUNIT_ASSERT_EQUAL("test"s, targets[3].path); } void getTasks_test() @@ -112,27 +112,27 @@ public: Settings settings{ .builddir = "foo" }; { auto tasks = getTasks(settings); - uASSERT_EQUAL(6u, tasks.size()); + uUNIT_ASSERT_EQUAL(6u, tasks.size()); // Note: count() is used here because the order of // std::set<std::shared_ptr<T>> is not deterministic. - uASSERT_EQUAL(1u, count(tasks, "target1"s)); - uASSERT_EQUAL(1u, count(tasks, "target2"s)); - uASSERT_EQUAL(1u, count(tasks, "target3"s)); - uASSERT_EQUAL(1u, count(tasks, "target4"s)); - uASSERT_EQUAL(1u, count(tasks, "test/target1-foo_cc.o"s)); - uASSERT_EQUAL(1u, count(tasks, "test/target1-bar_c.o"s)); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "target1"s)); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "target2"s)); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "target3"s)); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "target4"s)); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "test/target1-foo_cc.o"s)); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "test/target1-bar_c.o"s)); } { auto tasks = getTasks(settings, {"target1", "target3"}); - uASSERT_EQUAL(4u, tasks.size()); - uASSERT_EQUAL(1u, count(tasks, "target1"s)); - uASSERT_EQUAL(1u, count(tasks, "target3"s)); - uASSERT_EQUAL(1u, count(tasks, "test/target1-foo_cc.o"s)); - uASSERT_EQUAL(1u, count(tasks, "test/target1-bar_c.o"s)); + uUNIT_ASSERT_EQUAL(4u, tasks.size()); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "target1"s)); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "target3"s)); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "test/target1-foo_cc.o"s)); + uUNIT_ASSERT_EQUAL(1u, count(tasks, "test/target1-bar_c.o"s)); } { auto tasks = getTasks(settings, {"no-such-target"}); - uASSERT_EQUAL(0u, tasks.size()); + uUNIT_ASSERT_EQUAL(0u, tasks.size()); } } @@ -147,10 +147,10 @@ public: for(auto& task : dirtyTasks) { - uASSERT_EQUAL(0, task->registerDepTasks(allTasks)); + uUNIT_ASSERT_EQUAL(0, task->registerDepTasks(allTasks)); } - uASSERT_EQUAL(nullptr, getNextTask(allTasks, dirtyTasks)); + uUNIT_ASSERT_EQUAL(nullptr, getNextTask(allTasks, dirtyTasks)); } { // Zero (One task, no dirty) @@ -163,10 +163,10 @@ public: for(auto& task : dirtyTasks) { - uASSERT_EQUAL(0, task->registerDepTasks(allTasks)); + uUNIT_ASSERT_EQUAL(0, task->registerDepTasks(allTasks)); } - uASSERT_EQUAL(nullptr, getNextTask(allTasks, dirtyTasks)); + uUNIT_ASSERT_EQUAL(nullptr, getNextTask(allTasks, dirtyTasks)); } { // One (One task, one dirty) @@ -180,11 +180,11 @@ public: for(auto& task : dirtyTasks) { - uASSERT_EQUAL(0, task->registerDepTasks(allTasks)); + uUNIT_ASSERT_EQUAL(0, task->registerDepTasks(allTasks)); } - uASSERT_EQUAL(task1, getNextTask(allTasks, dirtyTasks)); - uASSERT_EQUAL(0u, dirtyTasks.size()); + uUNIT_ASSERT_EQUAL(task1, getNextTask(allTasks, dirtyTasks)); + uUNIT_ASSERT_EQUAL(0u, dirtyTasks.size()); } { // One (Two tasks, one dirty) @@ -200,11 +200,11 @@ public: for(auto& task : dirtyTasks) { - uASSERT_EQUAL(0, task->registerDepTasks(allTasks)); + uUNIT_ASSERT_EQUAL(0, task->registerDepTasks(allTasks)); } - uASSERT_EQUAL(task2, getNextTask(allTasks, dirtyTasks)); - uASSERT_EQUAL(0u, dirtyTasks.size()); + uUNIT_ASSERT_EQUAL(task2, getNextTask(allTasks, dirtyTasks)); + uUNIT_ASSERT_EQUAL(0u, dirtyTasks.size()); } { // One (Two tasks, one dirty which depends on the other) @@ -222,11 +222,11 @@ public: for(auto& task : dirtyTasks) { - uASSERT_EQUAL(0, task->registerDepTasks(allTasks)); + uUNIT_ASSERT_EQUAL(0, task->registerDepTasks(allTasks)); } - uASSERT_EQUAL(task2, getNextTask(allTasks, dirtyTasks)); - uASSERT_EQUAL(0u, dirtyTasks.size()); + uUNIT_ASSERT_EQUAL(task2, getNextTask(allTasks, dirtyTasks)); + uUNIT_ASSERT_EQUAL(0u, dirtyTasks.size()); } { // One (Two tasks, Both dirty, one depends on the other) @@ -245,11 +245,11 @@ public: for(auto& task : dirtyTasks) { - uASSERT_EQUAL(0, task->registerDepTasks(allTasks)); + uUNIT_ASSERT_EQUAL(0, task->registerDepTasks(allTasks)); } - uASSERT_EQUAL(task1, getNextTask(allTasks, dirtyTasks)); - uASSERT_EQUAL(1u, dirtyTasks.size()); + uUNIT_ASSERT_EQUAL(task1, getNextTask(allTasks, dirtyTasks)); + uUNIT_ASSERT_EQUAL(1u, dirtyTasks.size()); } } |