commit d5c48e0e199accec7fb2e364ad98d3d4662f003f
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jun 24 11:58:14 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jun 25 22:51:29 2015 -0700
tree 3ed8504d4e52c64bba83388fcac25f81b9200b13
parent 9d158f033cdda77be4ec15967477aa8808490808

encoding: Improving structure and documentation of block helpers

This commit add several new helpers to simplify operations with
std::string:

- prependStringBlock
- makeStringBlock
- readString

The following functions are deprecated and their replacements:

- nonNegativeIntegerBlock (use makeNonNegativeIntegerBlock)
- prependBooleanBlock (use prependEmptyBlock)
- booleanBlock (use makeEmptyBlock)
- dataBlock (use makeBinaryBlock)
- nestedBlock (use makeNestedBlock)

Change-Id: Ic595ae64fc9c80c2c04e5fde1d8812e8b9debd60
Refs: #2951

tests/unit-tests/meta-info.t.cpp

diff --git a/tests/unit-tests/meta-info.t.cpp b/tests/unit-tests/meta-info.t.cpp
index 6c158a2..77bdd3e 100644
--- a/tests/unit-tests/meta-info.t.cpp
+++ b/tests/unit-tests/meta-info.t.cpp
@@ -122,18 +122,18 @@
 
   for (int i = 0; i < 5; i++) {
     uint32_t type = 128 + i * 10;
-    info1.addAppMetaInfo(nonNegativeIntegerBlock(type, ints[i]));
+    info1.addAppMetaInfo(makeNonNegativeIntegerBlock(type, ints[i]));
     const std::string& s = ss[i];
     type += 5;
-    info1.addAppMetaInfo(dataBlock(type, s.c_str(), s.size()));
+    info1.addAppMetaInfo(makeStringBlock(type, s));
   }
 
   BOOST_CHECK(info1.findAppMetaInfo(252) == 0);
 
-  info1.addAppMetaInfo(nonNegativeIntegerBlock(252, 1000));
+  info1.addAppMetaInfo(makeNonNegativeIntegerBlock(252, 1000));
   BOOST_CHECK(info1.findAppMetaInfo(252) != 0);
 
-  info1.addAppMetaInfo(nonNegativeIntegerBlock(252, 1000));
+  info1.addAppMetaInfo(makeNonNegativeIntegerBlock(252, 1000));
   BOOST_CHECK(info1.findAppMetaInfo(252) != 0);
 
   info1.removeAppMetaInfo(252);
@@ -187,11 +187,11 @@
 {
   MetaInfo info;
 
-  BOOST_CHECK_NO_THROW(info.addAppMetaInfo(nonNegativeIntegerBlock(128, 1000)));
-  BOOST_CHECK_NO_THROW(info.addAppMetaInfo(nonNegativeIntegerBlock(252, 1000)));
+  BOOST_CHECK_NO_THROW(info.addAppMetaInfo(makeNonNegativeIntegerBlock(128, 1000)));
+  BOOST_CHECK_NO_THROW(info.addAppMetaInfo(makeNonNegativeIntegerBlock(252, 1000)));
 
-  BOOST_CHECK_THROW(info.addAppMetaInfo(nonNegativeIntegerBlock(127, 1000)), MetaInfo::Error);
-  BOOST_CHECK_THROW(info.addAppMetaInfo(nonNegativeIntegerBlock(253, 1000)), MetaInfo::Error);
+  BOOST_CHECK_THROW(info.addAppMetaInfo(makeNonNegativeIntegerBlock(127, 1000)), MetaInfo::Error);
+  BOOST_CHECK_THROW(info.addAppMetaInfo(makeNonNegativeIntegerBlock(253, 1000)), MetaInfo::Error);
 }
 
 BOOST_AUTO_TEST_SUITE_END()