SunnyQjm/NFD
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools: alias 'nfdc cs' to 'nfdc cs info'

Browse Source 
Change-Id: Ied1d34a84110ee0b6488d35d56fb1caecaf14117
Refs: #4498
This commit is contained in:
Davide Pesavento
2018-02-19 23:58:17 -05:00
parent 2a58815ee3
commit d214744ab8
10 changed files with 89 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/tools/nfdc/command-definition.t.cpp
+58 -10
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2017, Regents of the University of California,
/*
* Copyright (c) 2014-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -144,6 +144,8 @@ BOOST_AUTO_TEST_SUITE(ParseValue)
BOOST_AUTO_TEST_CASE(NoneType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::NONE), "none");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::NONE, Required::YES, Positional::NO);
@@ -159,6 +161,8 @@ BOOST_AUTO_TEST_CASE(NoneType)
BOOST_AUTO_TEST_CASE(AnyType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::ANY), "any");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::ANY, Required::NO, Positional::YES);
@@ -183,8 +187,42 @@ BOOST_AUTO_TEST_CASE(AnyType)
BOOST_CHECK_EQUAL(values.at(1), "c");
}
BOOST_AUTO_TEST_CASE(BooleanType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::BOOLEAN), "boolean");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::BOOLEAN, Required::YES);
CommandArguments ca;
ca = cs.parse({"a", "on"});
BOOST_CHECK_EQUAL(ca.size(), 1);
BOOST_CHECK(ca.at("a").type() == typeid(bool));
BOOST_CHECK_EQUAL(ca.get<bool>("a"), true);
ca = cs.parse({"a", "off"});
BOOST_CHECK_EQUAL(ca.size(), 1);
BOOST_CHECK(ca.at("a").type() == typeid(bool));
BOOST_CHECK_EQUAL(ca.get<bool>("a"), false);
BOOST_CHECK_EQUAL(cs.parse({"a", "true"}).get<bool>("a"), true);
BOOST_CHECK_EQUAL(cs.parse({"a", "enabled"}).get<bool>("a"), true);
BOOST_CHECK_EQUAL(cs.parse({"a", "yes"}).get<bool>("a"), true);
BOOST_CHECK_EQUAL(cs.parse({"a", "1"}).get<bool>("a"), true);
BOOST_CHECK_EQUAL(cs.parse({"a", "false"}).get<bool>("a"), false);
BOOST_CHECK_EQUAL(cs.parse({"a", "disabled"}).get<bool>("a"), false);
BOOST_CHECK_EQUAL(cs.parse({"a", "no"}).get<bool>("a"), false);
BOOST_CHECK_EQUAL(cs.parse({"a", "0"}).get<bool>("a"), false);
BOOST_CHECK_THROW(cs.parse({"a", "42"}), CommandDefinition::Error);
BOOST_CHECK_THROW(cs.parse({"a", "not-bool"}), CommandDefinition::Error);
}
BOOST_AUTO_TEST_CASE(UnsignedType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::UNSIGNED), "non-negative integer");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::UNSIGNED, Required::YES);
@@ -206,6 +244,8 @@ BOOST_AUTO_TEST_CASE(UnsignedType)
BOOST_AUTO_TEST_CASE(StringType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::STRING), "string");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::STRING, Required::YES);
@@ -219,6 +259,8 @@ BOOST_AUTO_TEST_CASE(StringType)
BOOST_AUTO_TEST_CASE(ReportFormatType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::REPORT_FORMAT), "ReportFormat");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::REPORT_FORMAT, Required::YES);
@@ -239,6 +281,8 @@ BOOST_AUTO_TEST_CASE(ReportFormatType)
BOOST_AUTO_TEST_CASE(NameType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::NAME), "Name");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::NAME, Required::YES);
@@ -252,6 +296,8 @@ BOOST_AUTO_TEST_CASE(NameType)
BOOST_AUTO_TEST_CASE(FaceUriType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::FACE_URI), "FaceUri");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::FACE_URI, Required::YES);
@@ -268,6 +314,8 @@ BOOST_AUTO_TEST_CASE(FaceUriType)
BOOST_AUTO_TEST_CASE(FaceIdOrUriType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::FACE_ID_OR_URI), "FaceId or FaceUri");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::FACE_ID_OR_URI, Required::YES);
@@ -288,6 +336,8 @@ BOOST_AUTO_TEST_CASE(FaceIdOrUriType)
BOOST_AUTO_TEST_CASE(FacePersistencyType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::FACE_PERSISTENCY), "FacePersistency");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::FACE_PERSISTENCY, Required::YES);
@@ -296,14 +346,12 @@ BOOST_AUTO_TEST_CASE(FacePersistencyType)
ca = cs.parse(std::vector<std::string>{"a", "persistent"});
BOOST_CHECK_EQUAL(ca.size(), 1);
BOOST_CHECK(ca.at("a").type() == typeid(FacePersistency));
BOOST_CHECK_EQUAL(ca.get<FacePersistency>("a"),
FacePersistency::FACE_PERSISTENCY_PERSISTENT);
BOOST_CHECK_EQUAL(ca.get<FacePersistency>("a"), FacePersistency::FACE_PERSISTENCY_PERSISTENT);
ca = cs.parse(std::vector<std::string>{"a", "permanent"});
BOOST_CHECK_EQUAL(ca.size(), 1);
BOOST_CHECK(ca.at("a").type() == typeid(FacePersistency));
BOOST_CHECK_EQUAL(ca.get<FacePersistency>("a"),
FacePersistency::FACE_PERSISTENCY_PERMANENT);
BOOST_CHECK_EQUAL(ca.get<FacePersistency>("a"), FacePersistency::FACE_PERSISTENCY_PERMANENT);
// nfdc does not accept "on-demand"
BOOST_CHECK_THROW(cs.parse(std::vector<std::string>{"a", "on-demand"}), CommandDefinition::Error);
@@ -311,6 +359,8 @@ BOOST_AUTO_TEST_CASE(FacePersistencyType)
BOOST_AUTO_TEST_CASE(RouteOriginType)
{
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(ArgValueType::ROUTE_ORIGIN), "RouteOrigin");
CommandDefinition cs("noun", "verb");
cs.addArg("a", ArgValueType::ROUTE_ORIGIN, Required::YES);
@@ -319,14 +369,12 @@ BOOST_AUTO_TEST_CASE(RouteOriginType)
ca = cs.parse(std::vector<std::string>{"a", "Nlsr"});
BOOST_CHECK_EQUAL(ca.size(), 1);
BOOST_CHECK(ca.at("a").type() == typeid(RouteOrigin));
BOOST_CHECK_EQUAL(ca.get<RouteOrigin>("a"),
RouteOrigin::ROUTE_ORIGIN_NLSR);
BOOST_CHECK_EQUAL(ca.get<RouteOrigin>("a"), RouteOrigin::ROUTE_ORIGIN_NLSR);
ca = cs.parse(std::vector<std::string>{"a", "27"});
BOOST_CHECK_EQUAL(ca.size(), 1);
BOOST_CHECK(ca.at("a").type() == typeid(RouteOrigin));
BOOST_CHECK_EQUAL(ca.get<RouteOrigin>("a"),
static_cast<RouteOrigin>(27));
BOOST_CHECK_EQUAL(ca.get<RouteOrigin>("a"), static_cast<RouteOrigin>(27));
BOOST_CHECK_THROW(cs.parse(std::vector<std::string>{"a", "not-RouteOrigin"}), CommandDefinition::Error);
}
tests/tools/nfdc/command-parser.t.cpp
+13 -12
View File
@@ -60,14 +60,12 @@ BOOST_AUTO_TEST_CASE(Basic)
BOOST_CHECK(parser.listCommands("", ParseMode::ONE_SHOT).empty());
CommandDefinition defHelp("help", "");
defHelp
.addArg("noun", ArgValueType::STRING, Required::NO, Positional::YES)
.addArg("verb", ArgValueType::STRING, Required::NO, Positional::YES);
parser.addCommand(defHelp, dummyExecute, AVAILABLE_IN_ONE_SHOT | AVAILABLE_IN_HELP);
CommandDefinition defFoo("foo", "");
parser.addCommand(defFoo, dummyExecute, AVAILABLE_IN_ONE_SHOT | AVAILABLE_IN_HELP);
CommandDefinition defStatusShow("status", "show");
parser.addCommand(defStatusShow, dummyExecute);
parser.addAlias("status", "show", "");
parser.addAlias("status", "show", "list");
BOOST_CHECK_THROW(parser.addAlias("status", "show2", "list"), std::out_of_range);
@@ -75,6 +73,7 @@ BOOST_AUTO_TEST_CASE(Basic)
defRouteList
.addArg("nexthop", ArgValueType::FACE_ID_OR_URI, Required::NO, Positional::YES);
parser.addCommand(defRouteList, dummyExecute);
parser.addAlias("route", "list", "");
CommandDefinition defRouteAdd("route", "add");
defRouteAdd
@@ -95,18 +94,18 @@ BOOST_AUTO_TEST_CASE(Basic)
CommandArguments ca;
ExecuteCommand execute;
std::tie(noun, verb, ca, execute) = parser.parse({"help"}, ParseMode::ONE_SHOT);
BOOST_CHECK_EQUAL(noun, "help");
BOOST_CHECK_EQUAL(verb, "");
std::tie(noun, verb, ca, execute) = parser.parse({"help", "foo"}, ParseMode::ONE_SHOT);
BOOST_CHECK_EQUAL(noun, "help");
std::tie(noun, verb, ca, execute) = parser.parse({"foo"}, ParseMode::ONE_SHOT);
BOOST_CHECK_EQUAL(noun, "foo");
BOOST_CHECK_EQUAL(verb, "");
std::tie(noun, verb, ca, execute) = parser.parse({"status"}, ParseMode::ONE_SHOT);
BOOST_CHECK_EQUAL(noun, "status");
BOOST_CHECK_EQUAL(verb, "show");
std::tie(noun, verb, ca, execute) = parser.parse({"status", "list"}, ParseMode::ONE_SHOT);
BOOST_CHECK_EQUAL(noun, "status");
BOOST_CHECK_EQUAL(verb, "show");
std::tie(noun, verb, ca, execute) = parser.parse({"route", "add", "/n", "300"}, ParseMode::ONE_SHOT);
BOOST_CHECK_EQUAL(noun, "route");
BOOST_CHECK_EQUAL(verb, "add");
@@ -124,10 +123,12 @@ BOOST_AUTO_TEST_CASE(Basic)
BOOST_CHECK_THROW(parser.parse({}, ParseMode::ONE_SHOT),
CommandParser::NoSuchCommandError);
BOOST_CHECK_THROW(parser.parse({"cant-help"}, ParseMode::ONE_SHOT),
BOOST_CHECK_THROW(parser.parse({"bar"}, ParseMode::ONE_SHOT),
CommandParser::NoSuchCommandError);
BOOST_CHECK_THROW(parser.parse({"status", "hide"}, ParseMode::ONE_SHOT),
CommandParser::NoSuchCommandError);
BOOST_CHECK_THROW(parser.parse({"status", "show", "something"}, ParseMode::ONE_SHOT),
CommandDefinition::Error);
BOOST_CHECK_THROW(parser.parse({"route", "66"}, ParseMode::ONE_SHOT),
CommandParser::NoSuchCommandError);
BOOST_CHECK_THROW(parser.parse({"route", "add"}, ParseMode::ONE_SHOT),