[#939] Extending unit tests

diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc
index 010eb2bd99cd5682822f80b2ed2330a3af37523b..9f6d722886ec88a55fb684688facf0032445e953 100644 (file)
--- a/src/lib/dhcp/tests/libdhcp++_unittest.cc
+++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc
@@ -2281,6 +2281,18 @@ TEST_F(LibDhcpTest, stdOptionDefs4) {
                                     fqdn_buf.end(),
                                     typeid(OptionCustom));
 
+    // V4_SZTP_REDIRECT is using an array of tuples so let's create example data
+    const char opaque_tuple_data[] = {
+        0, 3, 1, 2, 3  // first 2 bytes are opaque data length, the rest is opaque data
+    };
+    std::vector<uint8_t> opaque_tuple_buf(opaque_tuple_data,
+                                          opaque_tuple_data + sizeof(opaque_tuple_data));
+
+    LibDhcpTest::testStdOptionDefs4(DHO_V4_SZTP_REDIRECT,
+                                    opaque_tuple_buf.begin(),
+                                    opaque_tuple_buf.end(),
+                                    typeid(OptionOpaqueDataTuples));
+
     std::vector<uint8_t> rdnss1_buf(begin, begin + 9);
     rdnss1_buf.insert(rdnss1_buf.end(), fqdn1_buf.begin(), fqdn1_buf.end());
 
@@ -2638,6 +2650,18 @@ TEST_F(LibDhcpTest, stdOptionDefs6) {
     LibDhcpTest::testStdOptionDefs6(D6O_RELAY_SOURCE_PORT, begin, begin + 2,
                                     typeid(OptionInt<uint16_t>));
 
+    // V6_SZTP_REDIRECT is using an array of tuples so let's create example data
+    const char opaque_tuple_data[] = {
+        0, 3, 1, 2, 3  // first 2 bytes are opaque data length, the rest is opaque data
+    };
+    std::vector<uint8_t> opaque_tuple_buf(opaque_tuple_data,
+                                          opaque_tuple_data + sizeof(opaque_tuple_data));
+
+    LibDhcpTest::testStdOptionDefs6(D60_V6_SZTP_REDIRECT,
+                                    opaque_tuple_buf.begin(),
+                                    opaque_tuple_buf.end(),
+                                    typeid(OptionOpaqueDataTuples));
+
     LibDhcpTest::testStdOptionDefs6(D6O_IPV6_ADDRESS_ANDSF, begin, end,
                                     typeid(Option6AddrLst));
 

diff --git a/src/lib/dhcp/tests/option_definition_unittest.cc b/src/lib/dhcp/tests/option_definition_unittest.cc
index 72199349a1477219403deca55730cdce88626d32..f303c87a05687719f4d1b2e02bde05baba3dfe38 100644 (file)
--- a/src/lib/dhcp/tests/option_definition_unittest.cc
+++ b/src/lib/dhcp/tests/option_definition_unittest.cc
@@ -1796,6 +1796,50 @@ TEST_F(OptionDefinitionTest, tuple4ArrayTokenized) {
     EXPECT_EQ("world", tuple2.getText());
 }
 
+// This test verifies that a definition of an option with an array
+// of DHCPv4 tuples can be created and that the instance of this option
+// can be created by specifying multiple DHCPv4 tuples in the textual format.
+// This test also verifies specific v4 Option #143 where tuple's string length
+// is coded on 2 octets instead of 1 as usual.
+TEST_F(OptionDefinitionTest, tuple4ArrayOption143) {
+    OptionDefinition opt_def("option-tuple", 143, DHCP4_OPTION_SPACE, "tuple", true);
+
+    OptionPtr option;
+
+    // Specify 3 tuples.
+    std::vector<std::string> values;
+    values.push_back("hello");
+    values.push_back("the");
+    values.push_back("world");
+
+    // Create an instance of this option using the definition.
+    ASSERT_NO_THROW(
+        option = opt_def.optionFactory(Option::V4, 143, values);
+    );
+
+    // Make sure that the returned option class is correct.
+    const Option* optptr = option.get();
+    ASSERT_TRUE(optptr);
+    ASSERT_TRUE(typeid(*optptr) == typeid(OptionOpaqueDataTuples));
+
+    // Validate the value.
+    OptionOpaqueDataTuplesPtr option_cast =
+        boost::dynamic_pointer_cast<OptionOpaqueDataTuples>(option);
+
+    // There should be 3 tuples in this option.
+    ASSERT_EQ(3, option_cast->getTuplesNum());
+
+    // Check their values.
+    OpaqueDataTuple tuple0 = option_cast->getTuple(0);
+    EXPECT_EQ("hello", tuple0.getText());
+
+    OpaqueDataTuple tuple1 = option_cast->getTuple(1);
+    EXPECT_EQ("the", tuple1.getText());
+
+    OpaqueDataTuple tuple2 = option_cast->getTuple(2);
+    EXPECT_EQ("world", tuple2.getText());
+}
+
 // This test verifies that a definition of an option with an array
 // of DHCPv6 tuples can be created and that the instance of this option
 // can be created by specifying multiple DHCPv6 tuples in the textual format.