Skip to content

Removes using namespace declarations #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 22, 2025
Merged

Removes using namespace declarations #35

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c33dc41
Removes `using namespace` declarations
OlekRaymond Oct 19, 2025
7b43f88
Merge branch 'Martchus:master' into using-namespace-declrations
OlekRaymond Oct 21, 2025
78a33b4
Fixes empty string
OlekRaymond Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions tests/cppunit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@

#include <iostream>

using namespace std;
using namespace CppUtilities;
using namespace CPPUNIT_NS;

/*!
* \brief Prints the names of all child tests of the specified \a test.
*/
void printTestNames(Test *test, Indentation indentation)
void printTestNames(CPPUNIT_NS::Test *test, Indentation indentation)
{
for (int index = 0, count = test->getChildTestCount(); index != count; ++index) {
const auto childTest = test->getChildTestAt(index);
cerr << '\n' << indentation << " - " << childTest->getName();
std::cerr << '\n' << indentation << " - " << childTest->getName();
printTestNames(childTest, indentation + 4);
}
}
Expand All @@ -39,44 +37,44 @@ int main(int argc, char **argv)
}

// list tests
TestFactoryRegistry &registry = TestFactoryRegistry::getRegistry();
CPPUNIT_NS::TestFactoryRegistry &registry = CPPUNIT_NS::TestFactoryRegistry::getRegistry();
if (testApp.onlyListUnits()) {
cerr << "Available tests:";
std::cerr << "Available tests:";
printTestNames(registry.makeTest(), Indentation(0));
cerr << '\n';
std::cerr << '\n';
return 0;
}

// run tests
TextUi::TestRunner runner;
CPPUNIT_NS::TextUi::TestRunner runner;
if (!testApp.unitsSpecified() || testApp.units().empty()) {
// no units specified -> test all
runner.addTest(registry.makeTest());
} else {
// pick specified units from overall test
Test *overallTest = registry.makeTest();
vector<const char *> unavailableUnits;
CPPUNIT_NS::Test *overallTest = registry.makeTest();
std::vector<const char *> unavailableUnits;
for (const char *unit : testApp.units()) {
try {
runner.addTest(overallTest->findTest(unit));
} catch (const invalid_argument &) {
} catch (const std::invalid_argument &) {
unavailableUnits.emplace_back(unit);
}
}
if (!unavailableUnits.empty()) {
cerr << "The following tests specified via --unit are not available:";
std::cerr << "The following tests specified via --unit are not available:";
for (const char *unitName : unavailableUnits) {
cerr << "\n - " << unitName;
std::cerr << "\n - " << unitName;
}
cerr << "\nAvailable tests:";
std::cerr << "\nAvailable tests:";
printTestNames(overallTest, Indentation(0));
cerr << '\n';
std::cerr << '\n';
return -1;
}
}
cerr << EscapeCodes::TextAttribute::Bold << "Executing test cases ..." << EscapeCodes::Phrases::EndFlush;
const auto ok = runner.run(string(), false);
cerr << (ok ? "Tests successful\n" : "Tests failed\n");
std::cerr << EscapeCodes::TextAttribute::Bold << "Executing test cases ..." << EscapeCodes::Phrases::EndFlush;
const auto ok = runner.run(std::string(), false);
std::cerr << (ok ? "Tests successful\n" : "Tests failed\n");
return !ok;
}

Expand Down