warrence
/
AdventOfCode2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update test cases to test both parts together 

The test cases for parts 1 and 2 differ only in the tested condition, not in the
tests themselves. This removes the need for derived test context classes.
This commit is contained in:
Stefan Müller 2024-12-23 18:04:59 +01:00
parent 73446b2d83
commit c85cffb992
6 changed files with 11 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/include/aocTests/Part1TestContext.hpp
View File

@ -1,26 +0,0 @@
// Solutions to the Advent Of Code 2024.
// Copyright (C) 2024 Stefan Müller
//
// This program is free software: you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free Software
// Foundation, either version 3 of the License, or (at your option) any later
// version.
//
// This program is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include <aocTests/TestContext.hpp>
class Part1TestContext
: public TestContext
{
public:
Part1TestContext(std::vector<std::string> inputPaths);
virtual long long int getResult(Solver& solver) const override;
};

26
tests/include/aocTests/Part2TestContext.hpp
View File

@ -1,26 +0,0 @@
// Solutions to the Advent Of Code 2024.
// Copyright (C) 2024 Stefan Müller
//
// This program is free software: you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free Software
// Foundation, either version 3 of the License, or (at your option) any later
// version.
//
// This program is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include <aocTests/TestContext.hpp>
class Part2TestContext
: public TestContext
{
public:
Part2TestContext(std::vector<std::string> inputPaths);
virtual long long int getResult(Solver& solver) const override;
};

2
tests/include/aocTests/TestContext.hpp
View File

@ -24,9 +24,7 @@ class TestContext
{ {
public: public:
TestContext(std::vector<std::string> inputPaths); TestContext(std::vector<std::string> inputPaths);
virtual ~TestContext() {};
std::vector<std::string> getInputPaths() const; std::vector<std::string> getInputPaths() const;
virtual long long int getResult(Solver& solver) const = 0;
private: private:
std::vector<std::string> inputPaths_; std::vector<std::string> inputPaths_;
}; };

24
tests/src/Part1TestContext.cpp
View File

@ -1,24 +0,0 @@
// Solutions to the Advent Of Code 2024.
// Copyright (C) 2024 Stefan Müller
//
// This program is free software: you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free Software
// Foundation, either version 3 of the License, or (at your option) any later
// version.
//
// This program is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>.
#include <aocTests/Part1TestContext.hpp>
Part1TestContext::Part1TestContext(std::vector<std::string> inputPaths)
: TestContext{ inputPaths } {}
long long int Part1TestContext::getResult(Solver& solver) const
{
return solver.getResultPart1();
}

24
tests/src/Part2TestContext.cpp
View File

@ -1,24 +0,0 @@
// Solutions to the Advent Of Code 2024.
// Copyright (C) 2024 Stefan Müller
//
// This program is free software: you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free Software
// Foundation, either version 3 of the License, or (at your option) any later
// version.
//
// This program is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>.
#include <aocTests/Part2TestContext.hpp>
Part2TestContext::Part2TestContext(std::vector<std::string> inputPaths)
: TestContext{ inputPaths } {}
long long int Part2TestContext::getResult(Solver& solver) const
{
return solver.getResultPart2();
}

31
tests/src/TestCases.cpp
View File

@ -19,24 +19,23 @@
#include <aoc/SolverEngine.hpp> #include <aoc/SolverEngine.hpp>
#include <aoc/HistorianHysteria.hpp> #include <aoc/HistorianHysteria.hpp>
#include <aocTests/Part1TestContext.hpp> #include <aocTests/TestContext.hpp>
#include <aocTests/Part2TestContext.hpp>
#define REQUIRE_MESSAGE(cond, msg) if (!(cond)) { INFO(msg); REQUIRE(cond); } #define REQUIRE_MESSAGE(cond, msg) if (!(cond)) { INFO(msg); REQUIRE(cond); }
class TestCaseBase class TestCaseBase
{ {
public: public:
Part1TestContext part1TestContext{ getInputPaths() }; TestContext fullDataContext{ getInputPaths() };
Part2TestContext part2TestContext{ getInputPaths() }; TestContext exampleDataContext{ getExampleInputPaths() };
Part1TestContext part1ExampleTestContext{ getExampleInputPaths() }; void run(const std::unique_ptr<Solver>&& solver, const long long int expected1,
Part2TestContext part2ExampleTestContext{ getExampleInputPaths() }; const long long int expected2, const TestContext& context)
void run(std::unique_ptr<Solver>&& solver, const long long int expected, const TestContext& context)
{ {
SolverEngine solverEngine{ context.getInputPaths() }; SolverEngine solverEngine{ context.getInputPaths() };
solverEngine.run(*solver); solverEngine.run(*solver);
REQUIRE(expected == context.getResult(*solver)); REQUIRE(expected1 == solver->getResultPart1());
REQUIRE(expected2 == solver->getResultPart2());
} }
private: private:
std::vector<std::string> getInputPaths() const std::vector<std::string> getInputPaths() const
@ -53,20 +52,12 @@ class TestCaseBase
TEST_CASE("[HistorianHysteriaTests]") TEST_CASE("[HistorianHysteriaTests]")
{ {
TestCaseBase test; TestCaseBase test;
SECTION("FullData1") SECTION("FullData")
{ {
test.run(std::make_unique<HistorianHysteria>(), 2176849, test.part1TestContext); test.run(std::make_unique<HistorianHysteria>(), 2176849, 23384288, test.fullDataContext);
} }
SECTION("FullData2") SECTION("ExampleData")
{ {
test.run(std::make_unique<HistorianHysteria>(), 23384288, test.part2TestContext); test.run(std::make_unique<HistorianHysteria>(), 11, 31, test.exampleDataContext);
}
SECTION("ExampleData1")
{
test.run(std::make_unique<HistorianHysteria>(), 11, test.part1ExampleTestContext);
}
SECTION("ExampleData2")
{
test.run(std::make_unique<HistorianHysteria>(), 31, test.part2ExampleTestContext);
} }
} }