Skip to content

Commit 875a506

Browse files
huanchenzhuanchenz
committed
shorten test_surf
1 parent 27bff8c commit 875a506

File tree

1 file changed

+96
-102
lines changed

1 file changed

+96
-102
lines changed

‎test/unitTest/test_surf.cpp

Lines changed: 96 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -293,127 +293,121 @@ TEST_F (SuRFUnitTest, moveToKeyGreaterThanWordTest) {
293293

294294

295295
TEST_F (SuRFUnitTest, moveToKeyGreaterThanIntTest) {
296-
for (int t = 0; t < kNumSuffixType; t++) {
297-
for (int k = 0; k < kNumSuffixLen; k++) {
298-
newSuRFInts(kSuffixTypeList[t], kSuffixLenList[k]);
299-
bool inclusive = true;
300-
for (int i = 0; i < 2; i++) {
301-
if (i == 1)
302-
inclusive = false;
303-
for (uint64_t j = 0; j < kIntTestBound - 1; j++) {
304-
SuRF::Iter iter = surf_->moveToKeyGreaterThan(uint64ToString(j), inclusive);
296+
for (int k = 0; k < kNumSuffixLen; k++) {
297+
newSuRFInts(kMixed, kSuffixLenList[k]);
298+
bool inclusive = true;
299+
for (int i = 0; i < 2; i++) {
300+
if (i == 1)
301+
inclusive = false;
302+
for (uint64_t j = 0; j < kIntTestBound - 1; j++) {
303+
SuRF::Iter iter = surf_->moveToKeyGreaterThan(uint64ToString(j), inclusive);
305304

306-
ASSERT_TRUE(iter.isValid());
307-
unsigned bitlen;
308-
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
309-
std::string int_key_fp = uint64ToString(j - (j % kIntTestSkip));
310-
std::string int_key_true = uint64ToString(j - (j % kIntTestSkip) + kIntTestSkip);
311-
std::string int_prefix_fp = int_key_fp.substr(0, iter_key.length());
312-
std::string int_prefix_true = int_key_true.substr(0, iter_key.length());
313-
bool is_prefix = false;
314-
if (iter.getFpFlag())
315-
is_prefix = isEqual(int_prefix_fp, iter_key, bitlen);
316-
else
317-
is_prefix = isEqual(int_prefix_true, iter_key, bitlen);
318-
ASSERT_TRUE(is_prefix);
319-
}
305+
ASSERT_TRUE(iter.isValid());
306+
unsigned bitlen;
307+
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
308+
std::string int_key_fp = uint64ToString(j - (j % kIntTestSkip));
309+
std::string int_key_true = uint64ToString(j - (j % kIntTestSkip) + kIntTestSkip);
310+
std::string int_prefix_fp = int_key_fp.substr(0, iter_key.length());
311+
std::string int_prefix_true = int_key_true.substr(0, iter_key.length());
312+
bool is_prefix = false;
313+
if (iter.getFpFlag())
314+
is_prefix = isEqual(int_prefix_fp, iter_key, bitlen);
315+
else
316+
is_prefix = isEqual(int_prefix_true, iter_key, bitlen);
317+
ASSERT_TRUE(is_prefix);
318+
}
320319

321-
SuRF::Iter iter = surf_->moveToKeyGreaterThan(uint64ToString(kIntTestBound - 1), inclusive);
322-
if (iter.getFpFlag()) {
323-
ASSERT_TRUE(iter.isValid());
324-
unsigned bitlen;
325-
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
326-
std::string int_key_fp = uint64ToString(kIntTestBound - 1);
327-
std::string int_prefix_fp = int_key_fp.substr(0, iter_key.length());
328-
bool is_prefix = isEqual(int_prefix_fp, iter_key, bitlen);
329-
ASSERT_TRUE(is_prefix);
330-
} else {
331-
ASSERT_FALSE(iter.isValid());
332-
}
320+
SuRF::Iter iter = surf_->moveToKeyGreaterThan(uint64ToString(kIntTestBound - 1), inclusive);
321+
if (iter.getFpFlag()) {
322+
ASSERT_TRUE(iter.isValid());
323+
unsigned bitlen;
324+
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
325+
std::string int_key_fp = uint64ToString(kIntTestBound - 1);
326+
std::string int_prefix_fp = int_key_fp.substr(0, iter_key.length());
327+
bool is_prefix = isEqual(int_prefix_fp, iter_key, bitlen);
328+
ASSERT_TRUE(is_prefix);
329+
} else {
330+
ASSERT_FALSE(iter.isValid());
333331
}
334-
surf_->destroy();
335-
delete surf_;
336332
}
333+
surf_->destroy();
334+
delete surf_;
337335
}
338336
}
339337

340338
TEST_F (SuRFUnitTest, moveToKeyLessThanWordTest) {
341-
for (int t = 0; t < kNumSuffixType; t++) {
342-
for (int k = 0; k < kNumSuffixLen; k++) {
343-
newSuRFWords(kSuffixTypeList[t], kSuffixLenList[k]);
344-
bool inclusive = true;
345-
for (int i = 0; i < 2; i++) {
346-
if (i == 1)
347-
inclusive = false;
348-
for (unsigned j = 1; j < words.size(); j++) {
349-
SuRF::Iter iter = surf_->moveToKeyLessThan(words[j], inclusive);
339+
for (int k = 0; k < kNumSuffixLen; k++) {
340+
newSuRFWords(kMixed, kSuffixLenList[k]);
341+
bool inclusive = true;
342+
for (int i = 0; i < 2; i++) {
343+
if (i == 1)
344+
inclusive = false;
345+
for (unsigned j = 1; j < words.size(); j++) {
346+
SuRF::Iter iter = surf_->moveToKeyLessThan(words[j], inclusive);
350347

351-
ASSERT_TRUE(iter.isValid());
352-
unsigned bitlen;
353-
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
354-
std::string word_prefix_fp = words[j].substr(0, iter_key.length());
355-
std::string word_prefix_true = words[j-1].substr(0, iter_key.length());
356-
bool is_prefix = false;
357-
if (iter.getFpFlag())
358-
is_prefix = isEqual(word_prefix_fp, iter_key, bitlen);
359-
else
360-
is_prefix = isEqual(word_prefix_true, iter_key, bitlen);
361-
ASSERT_TRUE(is_prefix);
362-
}
348+
ASSERT_TRUE(iter.isValid());
349+
unsigned bitlen;
350+
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
351+
std::string word_prefix_fp = words[j].substr(0, iter_key.length());
352+
std::string word_prefix_true = words[j-1].substr(0, iter_key.length());
353+
bool is_prefix = false;
354+
if (iter.getFpFlag())
355+
is_prefix = isEqual(word_prefix_fp, iter_key, bitlen);
356+
else
357+
is_prefix = isEqual(word_prefix_true, iter_key, bitlen);
358+
ASSERT_TRUE(is_prefix);
359+
}
363360

364-
SuRF::Iter iter = surf_->moveToKeyLessThan(words[0], inclusive);
365-
if (iter.getFpFlag()) {
366-
ASSERT_TRUE(iter.isValid());
367-
unsigned bitlen;
368-
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
369-
std::string word_prefix_fp = words[0].substr(0, iter_key.length());
370-
bool is_prefix = isEqual(word_prefix_fp, iter_key, bitlen);
371-
ASSERT_TRUE(is_prefix);
372-
} else {
373-
ASSERT_FALSE(iter.isValid());
374-
}
361+
SuRF::Iter iter = surf_->moveToKeyLessThan(words[0], inclusive);
362+
if (iter.getFpFlag()) {
363+
ASSERT_TRUE(iter.isValid());
364+
unsigned bitlen;
365+
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
366+
std::string word_prefix_fp = words[0].substr(0, iter_key.length());
367+
bool is_prefix = isEqual(word_prefix_fp, iter_key, bitlen);
368+
ASSERT_TRUE(is_prefix);
369+
} else {
370+
ASSERT_FALSE(iter.isValid());
375371
}
376-
surf_->destroy();
377-
delete surf_;
378372
}
373+
surf_->destroy();
374+
delete surf_;
379375
}
380376
}
381377

382378
TEST_F (SuRFUnitTest, moveToKeyLessThanIntTest) {
383-
for (int t = 0; t < kNumSuffixType; t++) {
384-
for (int k = 0; k < kNumSuffixLen; k++) {
385-
newSuRFInts(kSuffixTypeList[t], kSuffixLenList[k]);
386-
bool inclusive = true;
387-
for (int i = 0; i < 2; i++) {
388-
if (i == 1)
389-
inclusive = false;
390-
for (uint64_t j = kIntTestSkip; j < kIntTestBound; j++) {
391-
SuRF::Iter iter = surf_->moveToKeyLessThan(uint64ToString(j), inclusive);
379+
for (int k = 0; k < kNumSuffixLen; k++) {
380+
newSuRFInts(kMixed, kSuffixLenList[k]);
381+
bool inclusive = true;
382+
for (int i = 0; i < 2; i++) {
383+
if (i == 1)
384+
inclusive = false;
385+
for (uint64_t j = kIntTestSkip; j < kIntTestBound; j++) {
386+
SuRF::Iter iter = surf_->moveToKeyLessThan(uint64ToString(j), inclusive);
392387

393-
ASSERT_TRUE(iter.isValid());
394-
unsigned bitlen;
395-
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
396-
std::string int_key = uint64ToString(j - (j % kIntTestSkip));
397-
std::string int_prefix = int_key.substr(0, iter_key.length());
398-
bool is_prefix = isEqual(int_prefix, iter_key, bitlen);
399-
ASSERT_TRUE(is_prefix);
400-
}
401-
SuRF::Iter iter = surf_->moveToKeyLessThan(uint64ToString(0), inclusive);
402-
if (iter.getFpFlag()) {
403-
ASSERT_TRUE(iter.isValid());
404-
unsigned bitlen;
405-
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
406-
std::string int_key = uint64ToString(0);
407-
std::string int_prefix = int_key.substr(0, iter_key.length());
408-
bool is_prefix = isEqual(int_prefix, iter_key, bitlen);
409-
ASSERT_TRUE(is_prefix);
410-
} else {
411-
ASSERT_FALSE(iter.isValid());
412-
}
388+
ASSERT_TRUE(iter.isValid());
389+
unsigned bitlen;
390+
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
391+
std::string int_key = uint64ToString(j - (j % kIntTestSkip));
392+
std::string int_prefix = int_key.substr(0, iter_key.length());
393+
bool is_prefix = isEqual(int_prefix, iter_key, bitlen);
394+
ASSERT_TRUE(is_prefix);
395+
}
396+
SuRF::Iter iter = surf_->moveToKeyLessThan(uint64ToString(0), inclusive);
397+
if (iter.getFpFlag()) {
398+
ASSERT_TRUE(iter.isValid());
399+
unsigned bitlen;
400+
std::string iter_key = iter.getKeyWithSuffix(&bitlen);
401+
std::string int_key = uint64ToString(0);
402+
std::string int_prefix = int_key.substr(0, iter_key.length());
403+
bool is_prefix = isEqual(int_prefix, iter_key, bitlen);
404+
ASSERT_TRUE(is_prefix);
405+
} else {
406+
ASSERT_FALSE(iter.isValid());
413407
}
414-
surf_->destroy();
415-
delete surf_;
416408
}
409+
surf_->destroy();
410+
delete surf_;
417411
}
418412
}
419413

0 commit comments

Comments
 (0)