Merge branch 'main' of github.com:google/or-tools

Author: lperron

ortools/base/BUILD.bazel

@@ -266,8 +266,8 @@ cc_library(
     name = "gmock",
     hdrs = ["gmock.h"],
     deps = [
-        ":message_matchers",
-        ":status_matchers",
+        ":protocol-buffer-matchers",
+        ":status-matchers",
         "@googletest//:gtest",
     ],
 )
@@ -408,16 +408,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "message_matchers",
-    hdrs = ["message_matchers.h"],
-    deps = [
-        "@abseil-cpp//absl/strings",
-        "@googletest//:gtest",
-        "@protobuf",
-    ],
-)
-
 cc_library(
     name = "murmur",
     hdrs = ["murmur.h"],
@@ -447,6 +437,7 @@ cc_library(
     name = "parse_text_proto",
     hdrs = ["parse_text_proto.h"],
     deps = [
+        "//ortools/base:status_macros",
         "@abseil-cpp//absl/log:check",
         "@protobuf",
     ],
@@ -477,6 +468,17 @@ cc_library(
     hdrs = ["protobuf_util.h"],
 )
 
+cc_library(
+    name = "protocol-buffer-matchers",
+    hdrs = ["protocol-buffer-matchers.h"],
+    deps = [
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/strings",
+        "@googletest//:gtest",
+        "@protobuf",
+    ],
+)
+
 cc_library(
     name = "protoutil",
     hdrs = ["protoutil.h"],
@@ -540,8 +542,8 @@ cc_library(
 )
 
 cc_library(
-    name = "status_matchers",
-    hdrs = ["status_matchers.h"],
+    name = "status-matchers",
+    hdrs = ["status-matchers.h"],
     deps = [
         ":base",
         "@abseil-cpp//absl/status",

ortools/base/CMakeLists.txt

@@ -12,8 +12,10 @@
 # limitations under the License.
 
 file(GLOB _SRCS "*.h" "*.cc")
-list(FILTER _SRCS EXCLUDE REGEX ".*/.*_test.cc")
-list(FILTER _SRCS EXCLUDE REGEX "/status_matchers\\.h")
+list(FILTER _SRCS EXCLUDE REGEX "/.*_test.cc")
+list(FILTER _SRCS EXCLUDE REGEX "/status-matchers\.h")
+list(FILTER _SRCS EXCLUDE REGEX "/protocol-buffer-matchers\.h")
+
 set(NAME ${PROJECT_NAME}_base)
 
 # Will be merge in libortools.so

ortools/base/gmock.h

@@ -15,7 +15,7 @@
 #define OR_TOOLS_BASE_GMOCK_H_
 
 #include "gmock/gmock.h"
-#include "ortools/base/message_matchers.h"
-#include "ortools/base/status_matchers.h"
+#include "ortools/base/protocol-buffer-matchers.h"  // IWYU pragma: export
+#include "ortools/base/status-matchers.h"           // IWYU pragma: export
 
 #endif  // OR_TOOLS_BASE_GMOCK_H_

ortools/base/message_matchers.h

@@ -11,35 +11,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OR_TOOLS_BASE_PARSE_TEXT_PROTO_H_
-#define OR_TOOLS_BASE_PARSE_TEXT_PROTO_H_
+// emulates g3/net/proto2/contrib/parse_proto/parse_text_proto.h
+#ifndef ORTOOLS_BASE_PARSE_TEXT_PROTO_H_
+#define ORTOOLS_BASE_PARSE_TEXT_PROTO_H_
 
 #include <string>
-#include <string_view>
 
 #include "absl/log/check.h"
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"
+#include "ortools/base/status_macros.h"
 
 namespace google::protobuf::contrib::parse_proto {
 
 template <typename T>
-bool ParseTextProto(const std::string& input, T* proto) {
-  return google::protobuf::TextFormat::ParseFromString(input, proto);
+absl::Status ParseTextProtoInto(absl::string_view input, T* proto) {
+  if (google::protobuf::TextFormat::ParseFromString(input, proto))
+    return absl::OkStatus();
+  return absl::Status(absl::StatusCode::kInvalidArgument,
+                      "Could not parse the text proto\n");
 }
 
 template <typename T>
-T ParseTextOrDie(const std::string& input) {
+absl::StatusOr<T> ParseTextProto(absl::string_view asciipb) {
+  T msg;
+  RETURN_IF_ERROR(ParseTextProtoInto(asciipb, &msg));
+  return msg;
+}
+
+template <typename T>
+T ParseTextOrDie(absl::string_view input) {
   T result;
-  CHECK(ParseTextProto(input, &result));
+  CHECK(google::protobuf::TextFormat::ParseFromString(input, &result));
   return result;
 }
 
 namespace text_proto_internal {
 
 class ParseProtoHelper {
  public:
-  explicit ParseProtoHelper(std::string_view asciipb) : asciipb_(asciipb) {}
+  explicit ParseProtoHelper(absl::string_view asciipb) : asciipb_(asciipb) {}
   template <class T>
   operator T() {  // NOLINT(runtime/explicit)
     T result;
@@ -56,10 +69,10 @@ class ParseProtoHelper {
 }  // namespace text_proto_internal
 
 inline text_proto_internal::ParseProtoHelper ParseTextProtoOrDie(
-    std::string_view input) {
+    absl::string_view input) {
   return text_proto_internal::ParseProtoHelper(input);
 }
 
 }  // namespace google::protobuf::contrib::parse_proto
 
-#endif  // OR_TOOLS_BASE_PARSE_TEXT_PROTO_H_
+#endif  // ORTOOLS_BASE_PARSE_TEXT_PROTO_H_