unit: fix up noodle unit tests

diff --git a/unit/internal/noodle.cpp b/unit/internal/noodle.cpp
index 56fcc8f0273f020015289a3d10e94034f5fb56b2..d1d9a1b47aedf17e4f606fc671ccfa1ea86edc54 100644 (file)
--- a/unit/internal/noodle.cpp
+++ b/unit/internal/noodle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Intel Corporation
+ * Copyright (c) 2015-2016, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -33,6 +33,7 @@
 #include "hwlm/noodle_engine.h"
 #include "hwlm/hwlm.h"
 #include "util/alloc.h"
+#include "util/ue2string.h"
 
 #include <cstring>
 #include <vector>
@@ -64,9 +65,15 @@ hwlmcb_rv_t hlmSimpleCallback(size_t from, size_t to, u32 id, void *context) {
 }
 
 static
-void noodleMatch(const u8 *data, size_t data_len, const u8 *lit, size_t lit_len,
-                 char nocase, HWLMCallback cb, void *ctxt) {
-    auto n = noodBuildTable(lit, lit_len, nocase, 0);
+void noodleMatch(const u8 *data, size_t data_len, const char *lit,
+                 size_t lit_len, char nocase, HWLMCallback cb, void *ctxt) {
+    // Coerce to upper-case if nocase.
+    std::string s(lit, lit_len);
+    if (nocase) {
+        upperString(s);
+    }
+
+    auto n = noodBuildTable((const u8 *)s.c_str(), s.length(), nocase, 0);
     ASSERT_TRUE(n != nullptr);
 
     hwlm_error_t rv;
@@ -82,8 +89,7 @@ TEST(Noodle, nood1) {
 
     memset(data, 'a', data_len);
 
-    noodleMatch(data, data_len, (const u8 *)"a", 1, 0, hlmSimpleCallback,
-                &ctxt);
+    noodleMatch(data, data_len, "a", 1, 0, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(1024U, ctxt.size());
     for (i = 0; i < 1024; i++) {
         ASSERT_EQ(i, ctxt[i].from);
@@ -91,13 +97,11 @@ TEST(Noodle, nood1) {
     }
 
     ctxt.clear();
-    noodleMatch(data, data_len, (const u8 *)"A", 1, 0,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "A", 1, 0, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(0U, ctxt.size());
 
     ctxt.clear();
-    noodleMatch(data, data_len, (const u8 *)"A", 1, 1,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "A", 1, 1, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(1024U, ctxt.size());
     for (i = 0; i < 1024; i++) {
         ASSERT_EQ(i, ctxt[i].from);
@@ -106,8 +110,8 @@ TEST(Noodle, nood1) {
 
     for (j = 0; j < 16; j++) {
         ctxt.clear();
-        noodleMatch(data + j, data_len - j, (const u8 *)"A", 1, 1,
-                             hlmSimpleCallback, &ctxt);
+        noodleMatch(data + j, data_len - j, "A", 1, 1, hlmSimpleCallback,
+                    &ctxt);
         ASSERT_EQ(1024 - j, ctxt.size());
         for (i = 0; i < 1024 - j; i++) {
             ASSERT_EQ(i, ctxt[i].from);
@@ -115,8 +119,7 @@ TEST(Noodle, nood1) {
         }
 
         ctxt.clear();
-        noodleMatch(data, data_len - j, (const u8 *)"A", 1, 1,
-                             hlmSimpleCallback, &ctxt);
+        noodleMatch(data, data_len - j, "A", 1, 1, hlmSimpleCallback, &ctxt);
         ASSERT_EQ(1024 - j, ctxt.size());
         for (i = 0; i < 1024 - j; i++) {
             ASSERT_EQ(i, ctxt[i].from);
@@ -133,8 +136,7 @@ TEST(Noodle, nood2) {
 
     memset(data, 'a', data_len);
 
-    noodleMatch(data, data_len, (const u8 *)"aa", 2, 0,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "aa", 2, 0, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(1023U, ctxt.size());
     for (i = 0; i < 1023; i++) {
         ASSERT_EQ(i, ctxt[i].from);
@@ -142,18 +144,15 @@ TEST(Noodle, nood2) {
     }
 
     ctxt.clear();
-    noodleMatch(data, data_len, (const u8 *)"aA", 2, 0,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "aA", 2, 0, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(0U, ctxt.size());
 
     ctxt.clear();
-    noodleMatch(data, data_len, (const u8 *)"AA", 2, 0,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "AA", 2, 0, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(0U, ctxt.size());
 
     ctxt.clear();
-    noodleMatch(data, data_len, (const u8 *)"aa", 2, 1,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "aa", 2, 1, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(1023U, ctxt.size());
     for (i = 0; i < 1023; i++) {
         ASSERT_EQ(i, ctxt[i].from);
@@ -161,8 +160,7 @@ TEST(Noodle, nood2) {
     }
 
     ctxt.clear();
-    noodleMatch(data, data_len, (const u8 *)"Aa", 2, 1,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "Aa", 2, 1, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(1023U, ctxt.size());
     for (i = 0; i < 1023; i++) {
         ASSERT_EQ(i, ctxt[i].from);
@@ -170,8 +168,7 @@ TEST(Noodle, nood2) {
     }
 
     ctxt.clear();
-    noodleMatch(data, data_len, (const u8 *)"AA", 2, 1,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "AA", 2, 1, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(1023U, ctxt.size());
     for (i = 0; i < 1023; i++) {
         ASSERT_EQ(i, ctxt[i].from);
@@ -180,8 +177,8 @@ TEST(Noodle, nood2) {
 
     for (j = 0; j < 16; j++) {
         ctxt.clear();
-        noodleMatch(data + j, data_len - j, (const u8 *)"Aa", 2, 1,
-                             hlmSimpleCallback, &ctxt);
+        noodleMatch(data + j, data_len - j, "Aa", 2, 1, hlmSimpleCallback,
+                    &ctxt);
         ASSERT_EQ(1023 - j, ctxt.size());
         for (i = 0; i < 1023 - j; i++) {
             ASSERT_EQ(i, ctxt[i].from);
@@ -189,8 +186,7 @@ TEST(Noodle, nood2) {
         }
 
         ctxt.clear();
-        noodleMatch(data, data_len - j, (const u8 *)"aA", 2, 1,
-                             hlmSimpleCallback, &ctxt);
+        noodleMatch(data, data_len - j, "aA", 2, 1, hlmSimpleCallback, &ctxt);
         ASSERT_EQ(1023 - j, ctxt.size());
         for (i = 0; i < 1023 - j; i++) {
             ASSERT_EQ(i, ctxt[i].from);
@@ -207,8 +203,7 @@ TEST(Noodle, noodLong) {
 
     memset(data, 'a', data_len);
 
-    noodleMatch(data, data_len, (const u8 *)"aaaa", 4, 0,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "aaaa", 4, 0, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(1021U, ctxt.size());
     for (i = 0; i < 1021; i++) {
         ASSERT_EQ(i, ctxt[i].from);
@@ -216,13 +211,11 @@ TEST(Noodle, noodLong) {
     }
 
     ctxt.clear();
-    noodleMatch(data, data_len, (const u8 *)"aaAA", 4, 0,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "aaAA", 4, 0, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(0U, ctxt.size());
 
     ctxt.clear();
-    noodleMatch(data, data_len, (const u8 *)"aaAA", 4, 1,
-                         hlmSimpleCallback, &ctxt);
+    noodleMatch(data, data_len, "aaAA", 4, 1, hlmSimpleCallback, &ctxt);
     ASSERT_EQ(1021U, ctxt.size());
     for (i = 0; i < 1021; i++) {
         ASSERT_EQ(i, ctxt[i].from);
@@ -231,8 +224,8 @@ TEST(Noodle, noodLong) {
 
     for (j = 0; j < 16; j++) {
         ctxt.clear();
-        noodleMatch(data + j, data_len -j, (const u8 *)"AAaa", 4, 1,
-                             hlmSimpleCallback, &ctxt);
+        noodleMatch(data + j, data_len - j, "AAaa", 4, 1, hlmSimpleCallback,
+                    &ctxt);
         ASSERT_EQ(1021 - j, ctxt.size());
         for (i = 0; i < 1021 - j; i++) {
             ASSERT_EQ(i, ctxt[i].from);
@@ -240,8 +233,8 @@ TEST(Noodle, noodLong) {
         }
 
         ctxt.clear();
-        noodleMatch(data + j, data_len -j, (const u8 *)"aaaA", 4, 1,
-                             hlmSimpleCallback, &ctxt);
+        noodleMatch(data + j, data_len - j, "aaaA", 4, 1, hlmSimpleCallback,
+                    &ctxt);
         ASSERT_EQ(1021 - j, ctxt.size());
         for (i = 0; i < 1021 - j; i++) {
             ASSERT_EQ(i, ctxt[i].from);
@@ -260,8 +253,7 @@ TEST(Noodle, noodCutoverSingle) {
     for (u32 align = 0; align < 16; align++) {
         for (u32 len = 0; len < max_data_len; len++) {
             ctxt.clear();
-            noodleMatch(data + align, len, (const u8 *)"a", 1, 0,
-                    hlmSimpleCallback, &ctxt);
+            noodleMatch(data + align, len, "a", 1, 0, hlmSimpleCallback, &ctxt);
             EXPECT_EQ(len, ctxt.size());
             for (u32 i = 0; i < ctxt.size(); i++) {
                 ASSERT_EQ(i, ctxt[i].from);
@@ -281,9 +273,9 @@ TEST(Noodle, noodCutoverDouble) {
     for (u32 align = 0; align < 16; align++) {
         for (u32 len = 0; len < max_data_len; len++) {
             ctxt.clear();
-            noodleMatch(data + align, len, (const u8 *)"aa", 2, 0,
-                    hlmSimpleCallback, &ctxt);
-            EXPECT_EQ(len ? len - 1 : 0U , ctxt.size());
+            noodleMatch(data + align, len, "aa", 2, 0, hlmSimpleCallback,
+                        &ctxt);
+            EXPECT_EQ(len ? len - 1 : 0U, ctxt.size());
             for (u32 i = 0; i < ctxt.size(); i++) {
                 ASSERT_EQ(i, ctxt[i].from);
                 ASSERT_EQ(i + 1, ctxt[i].to);