Add more test code for normstrngs_test

unilib.h is now available, so more code can be enabled.

Signed-off-by: Stefan Weil <[email protected]>

Author: stweil

unittest/Makefile.am

@@ -273,6 +273,7 @@ matrix_test_SOURCES = matrix_test.cc
 matrix_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
 
 normstrngs_test_SOURCES = normstrngs_test.cc
+normstrngs_test_SOURCES += third_party/utf/rune.c util/utf8/unilib.cc
 normstrngs_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
 
 nthitem_test_SOURCES = nthitem_test.cc

unittest/normstrngs_test.cc

@@ -15,16 +15,14 @@
 #include "normstrngs_test.h"
 #include "strngs.h"
 #include "unichar.h"
-#if defined(HAS_UNILIB_H)
-#include "unilib.h"
-#endif
+#include "util/utf8/unilib.h"
 
 #include "include_gunit.h"
 
 namespace tesseract {
 namespace {
 
-#if defined(HAS_UNILIB_H)
+#if defined(MISSING_CODE)
 static std::string EncodeAsUTF8(const char32 ch32) {
   UNICHAR uni_ch(ch32);
   return std::string(uni_ch.utf8(), uni_ch.utf8_len());
@@ -363,7 +361,6 @@ TEST(NormstrngsTest, SpanUTF8NotWhitespace) {
   EXPECT_EQ(12, SpanUTF8NotWhitespace(kMixedText));
 }
 
-#if defined(HAS_UNILIB_H)
 // Test that the method clones the util/utf8/public/unilib definition of
 // interchange validity.
 TEST(NormstrngsTest, IsInterchangeValid) {
@@ -374,12 +371,11 @@ TEST(NormstrngsTest, IsInterchangeValid) {
     EXPECT_EQ(UniLib::IsInterchangeValid(ch), IsInterchangeValid(ch));
   }
 }
-#endif
 
-#if defined(HAS_UNILIB_H)
 // Test that the method clones the util/utf8/public/unilib definition of
 // 7-bit ASCII interchange validity.
 TEST(NormstrngsTest, IsInterchangeValid7BitAscii) {
+#if defined(MISSING_CODE)
   const int32_t kMinUnicodeValue = 33;
   const int32_t kMaxUnicodeValue = 0x10FFFF;
   for (int32_t ch = kMinUnicodeValue; ch <= kMaxUnicodeValue; ++ch) {
@@ -388,8 +384,11 @@ TEST(NormstrngsTest, IsInterchangeValid7BitAscii) {
     EXPECT_EQ(UniLib::IsInterchangeValid7BitAscii(str),
               IsInterchangeValid7BitAscii(ch));
   }
-}
+#else
+  // Skipped because of missing UniLib::IsInterchangeValid7BitAscii.
+  GTEST_SKIP();
 #endif
+}
 
 // Test that the method clones the util/utf8/public/unilib definition of
 // fullwidth-halfwidth .
@@ -401,7 +400,8 @@ TEST(NormstrngsTest, FullwidthToHalfwidth) {
   // U+FFE6 -> U+20A9 (won sign)
   EXPECT_EQ(0x20A9, FullwidthToHalfwidth(0xFFE6));
 
-#if defined(HAS_UNILIB_H)
+#if defined(MISSING_CODE)
+  // Skipped because of missing UniLib::FullwidthToHalfwidth.
   const int32_t kMinUnicodeValue = 33;
   const int32_t kMaxUnicodeValue = 0x10FFFF;
   for (int32_t ch = kMinUnicodeValue; ch <= kMaxUnicodeValue; ++ch) {