Skip to content

Commit

Permalink
Migrate nts test drivers to new design
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattrm456
mattrm456 committed Oct 8, 2024
1 parent 0b61679 commit 4625e58
Show file tree
Hide file tree
Showing 27 changed files with 3,152 additions and 3,129 deletions.
2 changes: 1 addition & 1 deletion groups/nts/ntsa/ntsa_datatype.t.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace BloombergLP {
namespace ntsa {

// Provide tests for 'ntsa::DataType'.
class DataTypeTets
class DataTypeTest
{
public:
// TODO
Expand Down
90 changes: 45 additions & 45 deletions groups/nts/ntsa/ntsa_interest.t.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)
NTSCFG_TEST_TRUE(interestSet.empty());

for (ntsa::Handle i = k_SOCKET_MIN; i <= k_SOCKET_MAX; ++i) {
test::ensureNotFound(interestSet, i);
InterestTest::ensureNotFound(interestSet, i);
}

// Attach each socket to the interest set.
Expand All @@ -237,10 +237,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
else {
test::ensureNotFound(interestSet, j);
InterestTest::ensureNotFound(interestSet, j);
}
}
}
Expand All @@ -253,10 +253,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
else {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
}
}
Expand All @@ -269,10 +269,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
else {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
}
}
Expand All @@ -285,10 +285,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
else {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
}
}
Expand All @@ -301,10 +301,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
else {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
}
}
Expand All @@ -318,10 +318,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
else {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
}
}
Expand All @@ -332,10 +332,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantBoth(interestSet, j);
InterestTest::ensureWantBoth(interestSet, j);
}
else {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
}
}
Expand All @@ -349,10 +349,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
else {
test::ensureWantBoth(interestSet, j);
InterestTest::ensureWantBoth(interestSet, j);
}
}
}
Expand All @@ -363,10 +363,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
else {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
}
}
Expand All @@ -380,10 +380,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
else {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
}
}
Expand All @@ -394,10 +394,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantBoth(interestSet, j);
InterestTest::ensureWantBoth(interestSet, j);
}
else {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
}
}
Expand All @@ -411,10 +411,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
else {
test::ensureWantBoth(interestSet, j);
InterestTest::ensureWantBoth(interestSet, j);
}
}
}
Expand All @@ -425,10 +425,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
else {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
}
}
Expand All @@ -442,10 +442,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
else {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
}
}
Expand All @@ -456,10 +456,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantBoth(interestSet, j);
InterestTest::ensureWantBoth(interestSet, j);
}
else {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
}
}
Expand All @@ -473,10 +473,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
else {
test::ensureWantBoth(interestSet, j);
InterestTest::ensureWantBoth(interestSet, j);
}
}
}
Expand All @@ -487,10 +487,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
else {
test::ensureWantReadable(interestSet, j);
InterestTest::ensureWantReadable(interestSet, j);
}
}
}
Expand All @@ -504,10 +504,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
else {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
}
}
Expand All @@ -518,10 +518,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantBoth(interestSet, j);
InterestTest::ensureWantBoth(interestSet, j);
}
else {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
}
}
Expand All @@ -535,10 +535,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
else {
test::ensureWantBoth(interestSet, j);
InterestTest::ensureWantBoth(interestSet, j);
}
}
}
Expand All @@ -549,10 +549,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
else {
test::ensureWantWritable(interestSet, j);
InterestTest::ensureWantWritable(interestSet, j);
}
}
}
Expand All @@ -565,10 +565,10 @@ NTSCFG_TEST_FUNCTION(ntsa::InterestTest::verifyCase2)

for (ntsa::Handle j = k_SOCKET_MIN; j <= k_SOCKET_MAX; ++j) {
if (j <= i) {
test::ensureNotFound(interestSet, j);
InterestTest::ensureNotFound(interestSet, j);
}
else {
test::ensureWantNone(interestSet, j);
InterestTest::ensureWantNone(interestSet, j);
}
}
}
Expand Down
26 changes: 15 additions & 11 deletions groups/nts/ntscfg/ntscfg_test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ BSLS_IDENT("$Id: $")
#include <bdlbb_blobutil.h>
#include <bdlbb_blobstreambuf.h>
#include <bdlbb_pooledblobbufferfactory.h>
#include <bdlbb_simpleblobbufferfactory.h>
#include <bdlf_bind.h>
#include <bdlf_memfn.h>
#include <bdlf_placeholder.h>
Expand Down Expand Up @@ -43,13 +44,16 @@ BSLS_IDENT("$Id: $")
#include <bsls_platform.h>
#include <bsls_timeinterval.h>
#include <bsls_types.h>
#include <bsl_algorithm.h>
#include <bsl_array.h>
#include <bsl_cstdio.h>
#include <bsl_cstdlib.h>
#include <bsl_cstring.h>
#include <bsl_functional.h>
#include <bsl_fstream.h>
#include <bsl_iomanip.h>
#include <bsl_iostream.h>
#include <bsl_list.h>
#include <bsl_map.h>
#include <bsl_ostream.h>
#include <bsl_set.h>
Expand Down Expand Up @@ -819,24 +823,24 @@ int main(int argc, char** argv)

int i = 1;
while (i < argc) {
const char* argvValue = argv[i];
const char* arg = argv[i];

if ((0 == bsl::strcmp(argv[i], "-?")) ||
(0 == bsl::strcmp(argv[i], "--help")))
if ((0 == bsl::strcmp(arg, "-?")) ||
(0 == bsl::strcmp(arg, "--help")))
{
BloombergLP::ntscfg::TestUtil::help();
return 1;
}

if ((0 == bsl::strcmp(argv[i], "-l")) ||
(0 == bsl::strcmp(argv[i], "--list")))
if ((0 == bsl::strcmp(arg, "-l")) ||
(0 == bsl::strcmp(arg, "--list")))
{
BloombergLP::ntscfg::TestUtil::list();
return 0;
}

if ((0 == bsl::strcmp(argv[i], "-v")) ||
(0 == bsl::strcmp(argv[i], "--verbosity")))
if ((0 == bsl::strcmp(arg, "-v")) ||
(0 == bsl::strcmp(arg, "--verbosity")))
{
++i;
if (i >= argc) {
Expand All @@ -845,7 +849,7 @@ int main(int argc, char** argv)
}

int level;
if (BloombergLP::ntscfg::TestUtil::parseInt(&level, argv[i])) {
if (BloombergLP::ntscfg::TestUtil::parseInt(&level, arg)) {
BloombergLP::ntscfg::testVerbosity = level;
}
else {
Expand All @@ -858,19 +862,19 @@ int main(int argc, char** argv)
continue;
}

if (0 == bsl::strcmp(argv[i], "--concern")) {
if (0 == bsl::strcmp(arg, "--concern")) {
++i;
if (i >= argc) {
BloombergLP::ntscfg::TestUtil::help();
return 1;
}
concern.makeValue(bsl::string(argv[i]));
concern.makeValue(bsl::string(arg));
++i;
continue;
}

if (concern.isNull()) {
concern.makeValue(bsl::string(argv[i]));
concern.makeValue(bsl::string(arg));
}
else {
BloombergLP::ntscfg::testVerbosity++;
Expand Down
Loading

0 comments on commit 4625e58

Please sign in to comment.