commit 0c5260354ac5a37b11bfd311dc53f8d1b0a5f1d0
author Davide Pesavento <davidepesa@gmail.com> Wed Jan 31 21:14:01 2024 -0500
committer Davide Pesavento <davidepesa@gmail.com> Wed Jan 31 21:14:01 2024 -0500
tree 16cca112d94ab5013dfc6404be10efc24f4dc31e
parent 3de7c52dee9c5eb1267d47dbc23df9de5c4d9c87

tests: use decorators to label test data generators

Also various minor cleanups

Change-Id: Iaee434991b923abdf464293fec35da22d6cb449a

tests/unit/net/face-uri.t.cpp

diff --git a/tests/unit/net/face-uri.t.cpp b/tests/unit/net/face-uri.t.cpp
index 170e498..f306a94 100644
--- a/tests/unit/net/face-uri.t.cpp
+++ b/tests/unit/net/face-uri.t.cpp
@@ -65,29 +65,29 @@
   void
   runTest(const std::string& request, bool shouldSucceed, const std::string& expectedUri = "")
   {
-    BOOST_TEST_CONTEXT(std::quoted(request) << " should " << (shouldSucceed ? "succeed" : "fail")) {
-      bool didInvokeCb = false;
-      FaceUri uri(request);
-      uri.canonize(
-        [&] (const FaceUri& canonicalUri) {
-          BOOST_CHECK_EQUAL(didInvokeCb, false);
-          didInvokeCb = true;
-          BOOST_CHECK_EQUAL(shouldSucceed, true);
-          if (shouldSucceed) {
-            BOOST_CHECK_EQUAL(canonicalUri.toString(), expectedUri);
-          }
-        },
-        [&] (const std::string&) {
-          BOOST_CHECK_EQUAL(didInvokeCb, false);
-          didInvokeCb = true;
-          BOOST_CHECK_EQUAL(shouldSucceed, false);
-        },
-        m_io, 30_s);
+    BOOST_TEST_INFO_SCOPE(std::quoted(request) << " should " << (shouldSucceed ? "succeed" : "fail"));
 
-      m_io.run();
-      BOOST_CHECK_EQUAL(didInvokeCb, true);
-      m_io.restart();
-    }
+    bool didInvokeCb = false;
+    FaceUri uri(request);
+    uri.canonize(
+      [&] (const FaceUri& canonicalUri) {
+        BOOST_CHECK_EQUAL(didInvokeCb, false);
+        didInvokeCb = true;
+        BOOST_CHECK_EQUAL(shouldSucceed, true);
+        if (shouldSucceed) {
+          BOOST_CHECK_EQUAL(canonicalUri.toString(), expectedUri);
+        }
+      },
+      [&] (const std::string&) {
+        BOOST_CHECK_EQUAL(didInvokeCb, false);
+        didInvokeCb = true;
+        BOOST_CHECK_EQUAL(shouldSucceed, false);
+      },
+      m_io, 30_s);
+
+    m_io.run();
+    BOOST_CHECK_EQUAL(didInvokeCb, true);
+    m_io.restart();
   }
 
 protected:
@@ -208,7 +208,7 @@
 }
 
 BOOST_FIXTURE_TEST_CASE(CanonizeUdpV4, CanonizeFixture,
-  * boost::unit_test::expected_failures(1))
+  * ut::expected_failures(1))
 {
   SKIP_IF_IPV4_UNAVAILABLE();
 
@@ -236,7 +236,7 @@
 }
 
 BOOST_FIXTURE_TEST_CASE(CanonizeUdpV6, CanonizeFixture,
-  * boost::unit_test::expected_failures(1))
+  * ut::expected_failures(1))
 {
   SKIP_IF_IPV6_UNAVAILABLE();
 
@@ -338,7 +338,7 @@
 }
 
 BOOST_FIXTURE_TEST_CASE(CanonizeTcpV4, CanonizeFixture,
-  * boost::unit_test::expected_failures(1))
+  * ut::expected_failures(1))
 {
   SKIP_IF_IPV4_UNAVAILABLE();
 
@@ -377,7 +377,7 @@
 }
 
 BOOST_FIXTURE_TEST_CASE(CanonizeTcpV6, CanonizeFixture,
-  * boost::unit_test::expected_failures(1))
+  * ut::expected_failures(1))
 {
   SKIP_IF_IPV6_UNAVAILABLE();
 
@@ -401,7 +401,7 @@
 }
 
 BOOST_AUTO_TEST_CASE(ParseUnix,
-  * boost::unit_test::expected_failures(1))
+  * ut::expected_failures(1))
 {
   FaceUri uri;
 
@@ -470,7 +470,7 @@
 }
 
 BOOST_AUTO_TEST_CASE(ParseDev,
-  * boost::unit_test::expected_failures(1))
+  * ut::expected_failures(1))
 {
   FaceUri uri;
 
@@ -591,7 +591,8 @@
   runTest("fd://0", false);
 }
 
-BOOST_AUTO_TEST_CASE(Bug1635)
+BOOST_AUTO_TEST_CASE(Ipv4MappedIpv6Address,
+  * ut::description("test for bug #1635"))
 {
   FaceUri uri;