Skip to content

Commit

Permalink
unittest: Fix and enable stats_test
Browse files Browse the repository at this point in the history
This requires a local definition for macro ABSL_ARRAYSIZE
(normally defined as part of the Abseil API).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
  • Loading branch information
stweil committed Aug 26, 2018
1 parent 6df28fb commit f95725a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 13 deletions.
4 changes: 4 additions & 0 deletions unittest/Makefile.am
Expand Up @@ -67,6 +67,7 @@ check_PROGRAMS = \
osd_test \
progress_test \
rect_test \
stats_test \
tesseracttests

TESTS = $(check_PROGRAMS)
Expand Down Expand Up @@ -123,6 +124,9 @@ progress_test_LDADD = $(GTEST_LIBS) $(GMOCK_LIBS) $(TESS_LIBS) $(LEPTONICA_LIBS)
rect_test_SOURCES = rect_test.cc
rect_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)

stats_test_SOURCES = stats_test.cc
stats_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)

tesseracttests_SOURCES = ../tests/tesseracttests.cpp
tesseracttests_LDADD = $(GTEST_LIBS) $(TESS_LIBS) $(LEPTONICA_LIBS)

Expand Down
1 change: 1 addition & 0 deletions unittest/include_gunit.h
Expand Up @@ -22,6 +22,7 @@ const char* FLAGS_test_tmpdir = ".";
class file: public tesseract::File {
};

#define ABSL_ARRAYSIZE(arr) (sizeof(arr) / sizeof(arr[0]))
#define ARRAYSIZE(arr) (sizeof(arr) / sizeof(arr[0]))
#define CHECK(test) ASSERT_HOST(test)

Expand Down
29 changes: 16 additions & 13 deletions unittest/stats_test.cc
@@ -1,7 +1,19 @@

#include "tesseract/ccstruct/statistc.h"
#include "tesseract/ccutil/genericvector.h"
#include "tesseract/ccutil/kdpair.h"
// (C) Copyright 2017, Google Inc.
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "statistc.h"
#include "genericvector.h"
#include "kdpair.h"

#include "include_gunit.h"

namespace {

Expand Down Expand Up @@ -45,12 +57,3 @@ TEST_F(STATSTest, TopNModes) {
}

} // namespace.









0 comments on commit f95725a

Please sign in to comment.