mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-01-21 00:20:45 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Replace more GenericVector by std::vector for src/unittest

Browse Source 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2021-03-18 15:30:06 +01:00
parent 48fe1e0232
commit 619b98b73f
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
unittest/resultiterator_test.cc
View File

@ -3,7 +3,6 @@
#include <tesseract/baseapi.h>
#include <tesseract/resultiterator.h>
#include <string>
#include "genericvector.h"
#include "scrollview.h"
#include "absl/strings/str_format.h" // for absl::StrFormat
@ -15,21 +14,6 @@ namespace tesseract {
// DEFINE_string(tess_config, "", "config file for tesseract");
// DEFINE_bool(visual_test, false, "Runs a visual test using scrollview");
// Helper functions for converting to STL vectors
template <typename T>
void ToVector(const GenericVector<T> &from, std::vector<T> *to) {
to->clear();
for (int i = 0; i < from.size(); i++)
to->push_back(from[i]);
}
template <typename T>
void ToVector(const std::vector<T> &from, std::vector<T> *to) {
to->clear();
for (int i = 0; i < from.size(); i++)
to->push_back(from[i]);
}
// The fixture for testing Tesseract.
class ResultIteratorTest : public testing::Test {
protected:
@ -174,13 +158,11 @@ protected:
gv_word_dirs.push_back(word_dirs[i]);
}
std::vector<int> output;
ResultIterator::CalculateTextlineOrder(in_ltr_context, gv_word_dirs, &output);
std::vector<int> calculated_order;
ResultIterator::CalculateTextlineOrder(in_ltr_context, gv_word_dirs, &calculated_order);
// STL vector can be used with EXPECT_EQ, so convert...
std::vector<int> correct_order(expected_reading_order,
expected_reading_order + num_reading_order_entries);
std::vector<int> calculated_order;
ToVector(output, &calculated_order);
EXPECT_EQ(correct_order, calculated_order);
}
@ -214,10 +196,9 @@ protected:
sane = false;
}
if (!sane) {
std::vector<int> output_copy2, empty;
ToVector(output, &output_copy2);
EXPECT_EQ(output_copy2, empty) << " permutation of 0.." << num_words - 1 << " not found in "
<< (in_ltr_context ? "ltr" : "rtl") << " context.";
std::vector<int> empty;
EXPECT_EQ(output, empty) << " permutation of 0.." << num_words - 1 << " not found in "
<< (in_ltr_context ? "ltr" : "rtl") << " context.";
}
}