ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commands: ensure the commands where actually defined by the closures

Browse source 
...next step in the CommandSetup_test
This commit is contained in:
Fischlurch 2017-03-19 03:57:12 +01:00
parent 09b91197d3
commit de7b9f87ed
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/proc/control/command.cpp
View file

@ -169,7 +169,7 @@ namespace control {
if (cmdID)
CommandRegistry::instance().track (cmdID, *this);
INFO (command, "Command \"%s\" defined OK", cStr(*this));
INFO (command, "%s defined OK", cStr(*this));
}

17
tests/core/proc/control/command-setup-test.cpp
View file

@ -30,6 +30,7 @@
#include "proc/control/command-def.hpp"
#include "lib/format-string.hpp"
#include "lib/format-cout.hpp"
#include "lib/util.hpp"
//#include "lib/time/timevalue.hpp"
//#include "lib/p.hpp"
@ -53,6 +54,7 @@ namespace test {
using std::string;
using std::regex;
using std::regex_replace;
using util::isnil;
using util::_Fmt;
@ -151,7 +153,7 @@ namespace test {
CommandSetup def_1 = CommandSetup{"test.CommandSetup.def_1"}
= [](CommandDef def)
= [](CommandDef& def)
{
def.operation (operate)
.captureUndo (capture)
@ -159,7 +161,7 @@ namespace test {
};
CommandSetup def_2 = CommandSetup{"test.CommandSetup.def_2"}
= [&](CommandDef def) // NOTE: we capture context by reference
= [&](CommandDef& def) // NOTE: we capture context by reference
{
def.operation ([&](uint cnt)
{
@ -182,11 +184,20 @@ namespace test {
void
verify_DefinitionRegistration()
{
CHECK (isnil (testString));
size_t cnt = CommandSetup::invokeDefinitionClosures();
CHECK (CommandSetup::pendingCnt() == 0);
CHECK (cnt == 3);
CHECK (testString == "Ichthyostega wuz here");
TODO ("verify the command definitions happened");
// the closure for the first entry did "something pointless",
// but it actually did not define a command entry, thus...
CHECK (not Command::defined("test.CommandSetup.def_0"));
// but the other two entries did indeed define commands
CHECK (Command::defined("test.CommandSetup.def_1"));
CHECK (Command::defined("test.CommandSetup.def_2"));
}