diff options
Diffstat (limited to 'document/src/tests/globalidtest.cpp')
| -rw-r--r-- | document/src/tests/globalidtest.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/document/src/tests/globalidtest.cpp b/document/src/tests/globalidtest.cpp index c6c974011ce..ab2af875e9f 100644 --- a/document/src/tests/globalidtest.cpp +++ b/document/src/tests/globalidtest.cpp @@ -84,18 +84,17 @@ namespace { TEST_F(GlobalIdTest, testBucketIdConversion) { - verifyDocumentId("userdoc:ns:1:abc"); - verifyDocumentId("userdoc:ns:1000:abc"); - verifyDocumentId("userdoc:hsgf:18446744073700000000:dfdfsdfg"); - verifyDocumentId("groupdoc:ns:somegroup:hmm"); + verifyDocumentId("id:ns:test:n=1:abc"); + verifyDocumentId("id:ns:test:n=1000:abc"); + verifyDocumentId("id:hsgf:test:n=18446744073700000000:dfdfsdfg"); + verifyDocumentId("id:ns:mytype:g=somegroup:hmm"); verifyDocumentId("doc::test"); verifyDocumentId("doc:myns:http://foo.bar"); verifyDocumentId("doc:jsrthsdf:a234aleingzldkifvasdfgadf"); } void -GlobalIdTest::verifyGlobalIdRange(const std::vector<DocumentId>& ids, - uint32_t countBits) +GlobalIdTest::verifyGlobalIdRange(const std::vector<DocumentId>& ids, uint32_t countBits) { BucketIdFactory factory; for (uint32_t i=0, n=ids.size(); i<n; ++i) { @@ -158,12 +157,11 @@ TEST_F(GlobalIdTest, testGidRangeConversion) switch (scheme) { case 0: ost << "doc:" << name_space.str() << ":"; break; - case 1: ost << "userdoc:" << name_space.str() << ":"; + case 1: ost << "id:" << name_space.str() << ":mytype:n="; ost << randomizer.nextUint32() << ":"; break; - case 2: ost << "groupdoc:" << name_space.str() << ":"; - for (uint32_t i=0, n=randomizer.nextUint32(1, 10); i<n; ++i) - { + case 2: ost << "id:" << name_space.str() << ":mytype:g="; + for (uint32_t i=0, n=randomizer.nextUint32(1, 10); i<n; ++i) { ost << (char) ('a' + randomizer.nextUint32(0, 25)); } ost << ":"; |