diff options
| author | Charles E. Rolke <chug@apache.org> | 2014-07-12 10:04:33 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2014-07-12 10:04:33 +0000 |
| commit | fba8594ec1e34d29f3f94f7b4439770edd1fb8c3 (patch) | |
| tree | 9166f32f7102ef1dcd721e9f9a94934d5ca71623 /qpid/cpp | |
| parent | ddc6081356f851b121886dfdc76f7cf3828ee023 (diff) | |
| download | qpid-python-fba8594ec1e34d29f3f94f7b4439770edd1fb8c3.tar.gz | |
QPID-5890: Improve Acl enum verification
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1609900 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/tests/Acl.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/qpid/cpp/src/tests/Acl.cpp b/qpid/cpp/src/tests/Acl.cpp index e04d3e1d5e..d5180a11a8 100644 --- a/qpid/cpp/src/tests/Acl.cpp +++ b/qpid/cpp/src/tests/Acl.cpp @@ -37,6 +37,7 @@ QPID_AUTO_TEST_SUITE(AclTestSuite) BOOST_CHECK_EQUAL(AclHelper::getObjectType((s)),(e)) QPID_AUTO_TEST_CASE(TestLexerObjectEnums) { + BOOST_CHECK_EQUAL(OBJECTSIZE, 6); OBJ_ENUMS(OBJ_QUEUE, "queue"); OBJ_ENUMS(OBJ_EXCHANGE, "exchange"); OBJ_ENUMS(OBJ_BROKER, "broker"); @@ -50,6 +51,7 @@ QPID_AUTO_TEST_CASE(TestLexerObjectEnums) { BOOST_CHECK_EQUAL(AclHelper::getAction((s)),(e)) QPID_AUTO_TEST_CASE(TestLexerActionEnums) { + BOOST_CHECK_EQUAL(ACTIONSIZE, 12); ACT_ENUMS(ACT_CONSUME, "consume"); ACT_ENUMS(ACT_PUBLISH, "publish"); ACT_ENUMS(ACT_CREATE, "create"); @@ -69,6 +71,7 @@ QPID_AUTO_TEST_CASE(TestLexerActionEnums) { BOOST_CHECK_EQUAL(AclHelper::getProperty((s)),(e)) QPID_AUTO_TEST_CASE(TestLexerPropertyEnums) { + BOOST_CHECK_EQUAL(PROPERTYSIZE, 20); PROP_ENUMS(PROP_NAME, "name"); PROP_ENUMS(PROP_DURABLE, "durable"); PROP_ENUMS(PROP_OWNER, "owner"); @@ -97,6 +100,7 @@ QPID_AUTO_TEST_CASE(TestLexerPropertyEnums) { BOOST_CHECK_EQUAL(AclHelper::getSpecProperty((s)),(e)) QPID_AUTO_TEST_CASE(TestLexerSpecPropertyEnums) { + BOOST_CHECK_EQUAL(SPECPROPSIZE, 26); SPECPROP_ENUMS(SPECPROP_NAME, "name"); SPECPROP_ENUMS(SPECPROP_DURABLE, "durable"); SPECPROP_ENUMS(SPECPROP_OWNER, "owner"); @@ -133,25 +137,13 @@ QPID_AUTO_TEST_CASE(TestLexerSpecPropertyEnums) { BOOST_CHECK_EQUAL(AclHelper::getAclResult((s)),(e)) QPID_AUTO_TEST_CASE(TestLexerResultEnums) { + BOOST_CHECK_EQUAL(RESULTSIZE, 4); RESULT_ENUMS(ALLOW, "allow"); RESULT_ENUMS(ALLOWLOG, "allow-log"); RESULT_ENUMS(DENY, "deny"); RESULT_ENUMS(DENYLOG, "deny-log"); } -#define ENUM_ENUMS(enum, func, size) \ - for (int i=0; i<(int)(size); i++) \ - BOOST_CHECK((func)( (enum)(i) ).length() != 0 ); - -QPID_AUTO_TEST_CASE(TextLexerEnumEnums) { - ENUM_ENUMS(ObjectType, AclHelper::getObjectTypeStr, OBJECTSIZE); - ENUM_ENUMS(Action, AclHelper::getActionStr, ACTIONSIZE); - ENUM_ENUMS(Property, AclHelper::getPropertyStr, PROPERTYSIZE); - ENUM_ENUMS(SpecProperty, AclHelper::getPropertyStr, SPECPROPSIZE); - ENUM_ENUMS(AclResult, AclHelper::getAclResultStr, RESULTSIZE); - -} - QPID_AUTO_TEST_SUITE_END() }} // namespace qpid::tests |