From 6cca1ca25e90fefb7e09c7be918ef619fc20caf5 Mon Sep 17 00:00:00 2001
From: David Sisson <EpsilonPrime@users.noreply.github.com>
Date: Wed, 26 Jul 2023 20:56:42 -0700
Subject: [PATCH] More fixes.

---
 src/substrait/textplan/converter/CMakeLists.txt |  3 ++-
 src/substrait/textplan/parser/CMakeLists.txt    |  3 ++-
 src/substrait/textplan/tests/RoundtripTest.cpp  | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/substrait/textplan/converter/CMakeLists.txt b/src/substrait/textplan/converter/CMakeLists.txt
index 5c7ae9ac..d8e92a16 100644
--- a/src/substrait/textplan/converter/CMakeLists.txt
+++ b/src/substrait/textplan/converter/CMakeLists.txt
@@ -27,7 +27,8 @@ target_link_libraries(
   symbol_table
   error_listener
   date::date
-  fmt::fmt-header-only)
+  fmt::fmt-header-only
+  absl::status)
 
 if(${SUBSTRAIT_CPP_BUILD_TESTING})
   add_subdirectory(tests)
diff --git a/src/substrait/textplan/parser/CMakeLists.txt b/src/substrait/textplan/parser/CMakeLists.txt
index a04e98f8..00dbb0b5 100644
--- a/src/substrait/textplan/parser/CMakeLists.txt
+++ b/src/substrait/textplan/parser/CMakeLists.txt
@@ -28,7 +28,8 @@ target_link_libraries(
   textplan_grammar
   fmt::fmt-header-only
   date::date
-  date::date-tz)
+  date::date-tz
+  absl::status)
 
 add_executable(planparser Tool.cpp)
 
diff --git a/src/substrait/textplan/tests/RoundtripTest.cpp b/src/substrait/textplan/tests/RoundtripTest.cpp
index 3b22071c..09aeeca3 100644
--- a/src/substrait/textplan/tests/RoundtripTest.cpp
+++ b/src/substrait/textplan/tests/RoundtripTest.cpp
@@ -70,12 +70,12 @@ std::vector<std::string> getTestCases() {
 
 TEST_P(RoundTripBinaryToTextFixture, RoundTrip) {
   auto filename = GetParam();
-  std::string json = readFromFile(filename);
-  auto planOrErrors = loadFromJson(json);
-  std::vector<std::string> errors = planOrErrors.errors();
-  ASSERT_THAT(errors, ::testing::ElementsAre());
+  auto jsonOrError = readFromFile(filename);
+  ASSERT_TRUE(jsonOrError.ok());
+  auto planOrError = loadFromJson(*jsonOrError);
+  ASSERT_TRUE(planOrError.ok());
 
-  auto plan = *planOrErrors;
+  auto plan = *planOrError;
 
   auto textResult = parseBinaryPlan(plan);
   auto textSymbols = textResult.getSymbolTable().getSymbols();