From c77356eb92830adf5d024d30e675615f51bced05 Mon Sep 17 00:00:00 2001
From: jfcarroll <jfcarroll@google.com>
Date: Mon, 13 Dec 2021 14:23:51 -0800
Subject: [PATCH] Missed tagging a commented out test for edwinwu, and cleaned
 up some minor problems with the filename/path validator.

PiperOrigin-RevId: 416134225
---
 cpp/core/core.cc                              |  8 ++++----
 cpp/core/internal/offline_frames_validator.cc | 20 +++++++++----------
 cpp/core/internal/offline_frames_validator.h  |  4 ++--
 cpp/platform/impl/ios/Tests/BUILD             |  1 +
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/cpp/core/core.cc b/cpp/core/core.cc
index cede3366..526e9977 100644
--- a/cpp/core/core.cc
+++ b/cpp/core/core.cc
@@ -132,10 +132,10 @@ void Core::SendPayload(absl::Span<const std::string> endpoint_ids,
   assert(payload.GetType() != Payload::Type::kUnknown);
   assert(!endpoint_ids.empty());
   if (payload.GetType() == Payload::Type::kFile) {
-    assert(parser::Validate(payload.GetFileName(),
-                            parser::ILLEGAL_FILENAME_PATTERNS));
-    assert(parser::Validate(payload.GetParentFolder(),
-                            parser::ILLEGAL_PARENT_FOLDER_PATTERNS));
+    assert(!parser::HasIllegalCharacters(payload.GetFileName(),
+                                         parser::ILLEGAL_FILENAME_PATTERNS));
+    assert(!parser::HasIllegalCharacters(
+        payload.GetParentFolder(), parser::ILLEGAL_PARENT_FOLDER_PATTERNS));
   }
 
   router_->SendPayload(&client_, endpoint_ids, std::move(payload), callback);
diff --git a/cpp/core/internal/offline_frames_validator.cc b/cpp/core/internal/offline_frames_validator.cc
index 83e11504..b2af1bfb 100644
--- a/cpp/core/internal/offline_frames_validator.cc
+++ b/cpp/core/internal/offline_frames_validator.cc
@@ -24,12 +24,12 @@ namespace location {
 namespace nearby {
 namespace connections {
 namespace parser {
-bool Validate(std::string toBeValidated,
-              std::vector<std::string> illegalPatterns) {
-  return !std::any_of(illegalPatterns.begin(), illegalPatterns.end(),
-                      [&toBeValidated](const auto& s) {
-                        return toBeValidated.find(s) != std::string::npos;
-                      });
+bool HasIllegalCharacters(std::string toBeValidated,
+                          std::vector<std::string> illegalPatterns) {
+  return std::any_of(illegalPatterns.begin(), illegalPatterns.end(),
+                     [&toBeValidated](const auto& s) {
+                       return toBeValidated.find(s) != std::string::npos;
+                     });
 }
 namespace {
 
@@ -132,15 +132,15 @@ Exception EnsureValidPayloadTransferFrame(const PayloadTransferFrame& frame) {
       frame.payload_header().type() ==
           PayloadTransferFrame::PayloadHeader::FILE) {
     if (frame.payload_header().has_file_name()) {
-      if (!Validate(frame.payload_header().file_name(),
-                    ILLEGAL_FILENAME_PATTERNS)) {
+      if (HasIllegalCharacters(frame.payload_header().file_name(),
+                               ILLEGAL_FILENAME_PATTERNS)) {
         return {Exception::kFailed};
       }
     }
 
     if (frame.payload_header().has_parent_folder()) {
-      if (!Validate(frame.payload_header().file_name(),
-                    ILLEGAL_PARENT_FOLDER_PATTERNS)) {
+      if (HasIllegalCharacters(frame.payload_header().file_name(),
+                               ILLEGAL_PARENT_FOLDER_PATTERNS)) {
         return {Exception::kFailed};
       }
     }
diff --git a/cpp/core/internal/offline_frames_validator.h b/cpp/core/internal/offline_frames_validator.h
index 019add63..2c8db738 100644
--- a/cpp/core/internal/offline_frames_validator.h
+++ b/cpp/core/internal/offline_frames_validator.h
@@ -33,8 +33,8 @@ const std::vector<std::string> ILLEGAL_PARENT_FOLDER_PATTERNS{
 
 Exception EnsureValidOfflineFrame(const OfflineFrame& offline_frame);
 
-bool Validate(std::string toBeValidated,
-              std::vector<std::string> illegalPatterns);
+bool HasIllegalCharacters(std::string toBeValidated,
+                          std::vector<std::string> illegalPatterns);
 
 }  // namespace parser
 }  // namespace connections
diff --git a/cpp/platform/impl/ios/Tests/BUILD b/cpp/platform/impl/ios/Tests/BUILD
index ce405aa4..5890a682 100644
--- a/cpp/platform/impl/ios/Tests/BUILD
+++ b/cpp/platform/impl/ios/Tests/BUILD
@@ -23,6 +23,7 @@ objc_library(
     srcs = [
         "Platform/GNCCryptoTest.mm",
         "Platform/GNCInputFileTest.mm",
+        # TODO(edwinwu): This test is failing, needs fixing.
         #"Platform/GNCMultiThreadExecutorTest.mm",
         "Platform/GNCScheduledExecutorTest.mm",
         "Platform/GNCSingleThreadExecutorTest.mm",