fly/flightgear
1
0
Fork 0
Code Activity

Nasal unit-testing feedback from Henning

Browse source
This commit is contained in:
James Turner 2020-06-05 21:00:59 +01:00
parent 033a53f1d7
commit 0015744486
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Scripting/NasalUnitTesting.cxx
View file

@ -236,7 +236,7 @@ bool executeNasalTest(const SGPath& path)
const auto source = file_in.read_all(); const auto source = file_in.read_all();
string errors; string errors;
string fileName = "executeNasalTest: " + path.utf8Str(); string fileName = path.utf8Str();
naRef code = parseTestFile(ctx, fileName.c_str(), naRef code = parseTestFile(ctx, fileName.c_str(),
source.c_str(), source.c_str(),
source.size(), errors); source.size(), errors);
@ -262,11 +262,18 @@ bool executeNasalTest(const SGPath& path)
nasalSys->callWithContext(ctx, setUpFunc, 0, nullptr ,localNS.get_naRef()); nasalSys->callWithContext(ctx, setUpFunc, 0, nullptr ,localNS.get_naRef());
} }
nasalSys->callWithContext(ctx, value.getValue<naRef>(), 0, nullptr, localNS.get_naRef()); const auto testName = value.getKey();
auto testFunc = value.getValue<naRef>();
if (!naIsFunc(testFunc)) {
SG_LOG(SG_NAVAID, SG_DEV_WARN, "Skipping non-function test member:" << testName);
continue;
}
nasalSys->callWithContext(ctx, testFunc, 0, nullptr, localNS.get_naRef());
if (static_activeTest->failure) { if (static_activeTest->failure) {
SG_LOG(SG_NASAL, SG_DEV_WARN, value.getKey() << ": Test failure:" << static_activeTest->failureMessage << "\n\tat: " << static_activeTest->failureFileName << ": " << static_activeTest->failLineNumber); SG_LOG(SG_NASAL, SG_ALERT, testName << ": Test failure:" << static_activeTest->failureMessage << "\n\tat: " << static_activeTest->failureFileName << ": " << static_activeTest->failLineNumber);
} else { } else {
SG_LOG(SG_NASAL, SG_INFO, value.getKey() << ": Test passed"); SG_LOG(SG_NASAL, SG_ALERT, testName << ": Test passed");
} }
if (naIsFunc(tearDown)) { if (naIsFunc(tearDown)) {