commit 4467c119049d8331569320cc1f8127a4931a7fe6
author Yingdi Yu <yuyingdi@gmail.com> Mon Oct 19 09:27:45 2015 -0700
committer Yingdi Yu <yuyingdi@gmail.com> Mon Oct 19 10:30:59 2015 -0700
tree 0aa9a6da16b9a9a618a2488ca7601809c26f9c17
parent 84986ccef0c79602c855f12f829c56ac8ab6404f

group manager: separate user prefix and data type

Change-Id: Iae3468e22ad740a9eea35652231fdd5a51ccb34a
Refs: #3015

tests/unit-tests/group-manager.t.cpp

diff --git a/tests/unit-tests/group-manager.t.cpp b/tests/unit-tests/group-manager.t.cpp
index 1d25698..4355957 100644
--- a/tests/unit-tests/group-manager.t.cpp
+++ b/tests/unit-tests/group-manager.t.cpp
@@ -166,7 +166,7 @@
   // create the group manager database
   std::string dbDir = tmpPath.c_str();
   dbDir += "/manager-d-key-test.db";
-  GroupManager manager(Name("Alice-read"), dbDir, 2048, 1);
+  GroupManager manager(Name("Alice"), Name("data_type"), dbDir, 2048, 1);
 
   Block newCertBlock = cert.wireEncode();
   IdentityCertificate newCert(newCertBlock);
@@ -220,11 +220,12 @@
   dbDir += "/manager-e-key-test.db";
 
   // create group manager
-  GroupManager manager(Name("Alice-read"), dbDir, 1024, 1);
+  GroupManager manager(Name("Alice"), Name("data_type"), dbDir, 1024, 1);
   setManager(manager);
 
   Data data = manager.createEKeyData("20150825T090000", "20150825T110000", encryptKeyBuf);
-  BOOST_CHECK_EQUAL(data.getName().toUri(), "/Alice-read/E-KEY/20150825T090000/20150825T110000");
+  BOOST_CHECK_EQUAL(data.getName().toUri(),
+                    "/Alice/read/data_type/E-KEY/20150825T090000/20150825T110000");
 
   Buffer contentBuf(data.getContent().value(), data.getContent().value_size());
   BOOST_CHECK_EQUAL_COLLECTIONS(encryptKeyBuf.begin(), encryptKeyBuf.end(),
@@ -239,7 +240,7 @@
   dbDir += "/manager-interval-test.db";
 
   // create group manager
-  GroupManager manager(Name("Alice-read"), dbDir, 1024, 1);
+  GroupManager manager(Name("Alice"), Name("data_type"), dbDir, 1024, 1);
   setManager(manager);
 
   std::map<Name, Buffer> memberKeys;
@@ -272,7 +273,7 @@
   dbDir += "/manager-group-key-test.db";
 
   // create group manager
-  GroupManager manager(Name("Alice-read"), dbDir, 1024, 1);
+  GroupManager manager(Name("Alice"), Name("data_type"), dbDir, 1024, 1);
   setManager(manager);
 
   // get data list from group manager
@@ -284,14 +285,14 @@
   // first data contain the group encrypt key(public key)
   std::list<Data>::iterator dataIterator = result.begin();
   BOOST_CHECK_EQUAL(dataIterator->getName().toUri(),
-                    "/Alice-read/E-KEY/20150825T090000/20150825T100000");
+                    "/Alice/read/data_type/E-KEY/20150825T090000/20150825T100000");
   EncryptKey<algo::Rsa> groupEKey(Buffer(dataIterator->getContent().value(),
                                          dataIterator->getContent().value_size()));
 
   // second data and decrypt
   dataIterator++;
   BOOST_CHECK_EQUAL(dataIterator->getName().getPrefix(-2).toUri(),
-                    "/Alice-read/D-KEY/20150825T090000/20150825T100000");
+                    "/Alice/read/data_type/D-KEY/20150825T090000/20150825T100000");
 
   //////////////////////////////////////////////////////////////////////// start decryption
   Block dataContent = dataIterator->getContent();