From de7676c88ec5faeca11185213539409b1376fc20 Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
Date: Sat, 25 Aug 2018 18:07:56 +0200
Subject: [PATCH] unittest: Fix and enable heap_test

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 unittest/Makefile.am  |  4 ++++
 unittest/heap_test.cc | 25 ++++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/unittest/Makefile.am b/unittest/Makefile.am
index 3283d399b0..5a9ef2408a 100644
--- a/unittest/Makefile.am
+++ b/unittest/Makefile.am
@@ -56,6 +56,7 @@ check_PROGRAMS = \
   cleanapi_test \
   colpartition_test \
   denorm_test \
+  heap_test \
   progress_test \
   intsimdmatrix_test \
   matrix_test \
@@ -83,6 +84,9 @@ colpartition_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
 denorm_test_SOURCES = denorm_test.cc
 denorm_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
 
+heap_test_SOURCES = heap_test.cc
+heap_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
+
 progress_test_SOURCES = progress_test.cc
 progress_test_LDFLAGS = $(OPENCL_LDFLAGS) $(LEPTONICA_LIBS)
 progress_test_LDADD = $(GTEST_LIBS) $(GMOCK_LIBS) $(TESS_LIBS) $(LEPTONICA_LIBS)
diff --git a/unittest/heap_test.cc b/unittest/heap_test.cc
index d984a48223..30d08cf5f5 100644
--- a/unittest/heap_test.cc
+++ b/unittest/heap_test.cc
@@ -1,11 +1,23 @@
+// (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 <string>
 #include <utility>
 
-#include "tesseract/ccutil/doubleptr.h"
-#include "tesseract/ccutil/genericheap.h"
-#include "tesseract/ccutil/genericvector.h"
-#include "tesseract/ccutil/kdpair.h"
+#include "doubleptr.h"
+#include "genericheap.h"
+#include "genericvector.h"
+#include "kdpair.h"
+
+#include "include_gunit.h"
 
 namespace tesseract {
 
@@ -176,8 +188,3 @@ TEST_F(HeapTest, DoublePtrTest) {
 }
 
 }  // namespace tesseract
-
-
-
-
-