[#4143] More UT code improvements

diff --git a/src/hooks/dhcp/flex_option/tests/sub_option_unittests.cc b/src/hooks/dhcp/flex_option/tests/sub_option_unittests.cc
index d611128906a0ff72544136e498dd5a15007c4ad3..4b8f931cd0752aa52b93c51fec092da4581a62b3 100644 (file)
--- a/src/hooks/dhcp/flex_option/tests/sub_option_unittests.cc
+++ b/src/hooks/dhcp/flex_option/tests/sub_option_unittests.cc
@@ -3224,11 +3224,12 @@ TEST_F(FlexSubOptionTest, subProcessQuery) {
     options->add(option);
     ElementPtr code = Element::create(222);
     option->set("code", code);
-    ElementPtr sub_options = Element::createList();
-    option->set("sub-options", sub_options);
     ElementPtr dest = Element::create(string("query"));
     option->set("destination", dest);
 
+    ElementPtr sub_options = Element::createList();
+    option->set("sub-options", sub_options);
+
     ElementPtr sub_option = Element::createMap();
     sub_options->add(sub_option);
     ElementPtr space = Element::create(string("my-space"));
@@ -3284,11 +3285,12 @@ TEST_F(FlexSubOptionTest, subProcessSource) {
     options->add(option);
     ElementPtr code = Element::create(222);
     option->set("code", code);
-    ElementPtr sub_options = Element::createList();
-    option->set("sub-options", sub_options);
     ElementPtr source = Element::create(string("response"));
     option->set("source", source);
 
+    ElementPtr sub_options = Element::createList();
+    option->set("sub-options", sub_options);
+
     ElementPtr sub_option = Element::createMap();
     sub_options->add(sub_option);
     ElementPtr space = Element::create(string("my-space"));
@@ -3348,11 +3350,12 @@ TEST_F(FlexSubOptionTest, subProcessMemberSource) {
     options->add(option);
     ElementPtr code = Element::create(222);
     option->set("code", code);
-    ElementPtr sub_options = Element::createList();
-    option->set("sub-options", sub_options);
     ElementPtr source = Element::create(string("response"));
     option->set("source", source);
 
+    ElementPtr sub_options = Element::createList();
+    option->set("sub-options", sub_options);
+
     ElementPtr sub_option = Element::createMap();
     sub_options->add(sub_option);
     ElementPtr space = Element::create(string("my-space"));
@@ -3400,6 +3403,7 @@ TEST_F(FlexSubOptionTest, subProcessReceive4) {
     options->add(option);
     ElementPtr code = Element::create(222);
     option->set("code", code);
+
     ElementPtr sub_options = Element::createList();
     option->set("sub-options", sub_options);
 
@@ -3439,6 +3443,7 @@ TEST_F(FlexSubOptionTest, subProcessReceive6) {
     options->add(option);
     ElementPtr code = Element::create(D6O_VENDOR_OPTS);
     option->set("code", code);
+
     ElementPtr sub_options = Element::createList();
     option->set("sub-options", sub_options);
 
@@ -3480,11 +3485,12 @@ TEST_F(FlexSubOptionTest, subProcessSend4) {
     options->add(option);
     ElementPtr code = Element::create(222);
     option->set("code", code);
-    ElementPtr sub_options = Element::createList();
-    option->set("sub-options", sub_options);
     ElementPtr dest = Element::create(string("query"));
     option->set("destination", dest);
 
+    ElementPtr sub_options = Element::createList();
+    option->set("sub-options", sub_options);
+
     ElementPtr sub_option = Element::createMap();
     sub_options->add(sub_option);
     ElementPtr space = Element::create(string("my-space"));
@@ -3524,11 +3530,12 @@ TEST_F(FlexSubOptionTest, subProcessSend6) {
     options->add(option);
     ElementPtr code = Element::create(D6O_VENDOR_OPTS);
     option->set("code", code);
-    ElementPtr sub_options = Element::createList();
-    option->set("sub-options", sub_options);
     ElementPtr dest = Element::create(string("query"));
     option->set("destination", dest);
 
+    ElementPtr sub_options = Element::createList();
+    option->set("sub-options", sub_options);
+
     ElementPtr sub_option = Element::createMap();
     sub_options->add(sub_option);
     ElementPtr space = Element::create(string("vendor-1234"));
@@ -3593,6 +3600,7 @@ TEST_F(FlexSubOptionLogTest, noWarning) {
 
     ElementPtr sub_options = Element::createList();
     option->set("sub-options", sub_options);
+
     ElementPtr sub_option = Element::createMap();
     sub_options->add(sub_option);
     ElementPtr space = Element::create(string("my-space"));
@@ -3629,11 +3637,12 @@ TEST_F(FlexSubOptionLogTest, classWarning) {
     options->add(option);
     ElementPtr code = Element::create(222);
     option->set("code", code);
-    ElementPtr sub_options = Element::createList();
-    option->set("sub-options", sub_options);
     ElementPtr dest = Element::create(string("query"));
     option->set("destination", dest);
 
+    ElementPtr sub_options = Element::createList();
+    option->set("sub-options", sub_options);
+
     ElementPtr sub_option = Element::createMap();
     sub_options->add(sub_option);
     ElementPtr space = Element::create(string("my-space"));
@@ -3674,11 +3683,12 @@ TEST_F(FlexSubOptionLogTest, memberWarning) {
     options->add(option);
     ElementPtr code = Element::create(222);
     option->set("code", code);
-    ElementPtr sub_options = Element::createList();
-    option->set("sub-options", sub_options);
     ElementPtr dest = Element::create(string("query"));
     option->set("destination", dest);
 
+    ElementPtr sub_options = Element::createList();
+    option->set("sub-options", sub_options);
+
     ElementPtr sub_option = Element::createMap();
     sub_options->add(sub_option);
     ElementPtr space = Element::create(string("my-space"));