Skip to content

Commit f16c46a

Browse files
cblichmanncopybara-github
cblichmann
authored and
copybara-github
committed
Import absl::status::status_matchers instead of our local implementation.
PiperOrigin-RevId: 764235127 Change-Id: I97c08aa3546c651ba0c4bf6fa4f10e216db9e17d
1 parent 502bdcf commit f16c46a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+103
-136
lines changed

‎contrib/brotli/test/brotli_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <fstream>
1818

19+
#include "absl/status/status_matchers.h"
1920
#include "contrib/brotli/sandboxed.h"
2021
#include "contrib/brotli/utils/utils_brotli.h"
2122
#include "contrib/brotli/utils/utils_brotli_dec.h"
@@ -25,7 +26,7 @@
2526

2627
namespace {
2728

28-
using ::sapi::IsOk;
29+
using ::absl_testing::IsOk;
2930

3031
class BrotliBase : public testing::Test {
3132
protected:

‎contrib/c-blosc/test/test_blosc.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <fstream>
1616

17+
#include "absl/status/status_matchers.h"
1718
#include "contrib/c-blosc/sandboxed.h"
1819
#include "contrib/c-blosc/utils/utils_blosc.h"
1920
#include "sandboxed_api/util/path.h"
@@ -22,7 +23,7 @@
2223

2324
namespace {
2425

25-
using ::sapi::IsOk;
26+
using ::absl_testing::IsOk;
2627

2728
constexpr size_t kDefaultBlockSize = 19059;
2829

‎contrib/hunspell/test/hunspell_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
#include <fstream>
1616

1717
#include "../sandboxed.h"
18+
#include "absl/status/status_matchers.h"
1819
#include "sandboxed_api/util/path.h"
1920
#include "sandboxed_api/util/status_matchers.h"
2021
#include "sandboxed_api/util/temp_file.h"
2122

2223
namespace {
2324

24-
using ::sapi::IsOk;
25+
using ::absl_testing::IsOk;
2526

2627
class HunspellTest : public ::testing::Test {
2728
protected:

‎contrib/libidn2/tests/libidn2_sapi_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818

1919
#include "gmock/gmock.h"
2020
#include "gtest/gtest.h"
21+
#include "absl/status/status_matchers.h"
2122
#include "sandboxed_api/testing.h"
2223
#include "sandboxed_api/util/status_matchers.h"
2324

24-
using ::sapi::IsOk;
25+
using ::absl_testing::IsOk;
2526
using ::testing::Not;
2627
using ::testing::StrEq;
2728

‎contrib/libraw/test/libraw_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
#include "absl/status/status_matchers.h"
1516
#include "contrib/libraw/sandboxed.h"
1617
#include "contrib/libraw/utils/utils_libraw.h"
1718
#include "sandboxed_api/util/path.h"
@@ -20,7 +21,7 @@
2021

2122
namespace {
2223

23-
using ::sapi::IsOk;
24+
using ::absl_testing::IsOk;
2425

2526
const struct TestVariant {
2627
std::string filename;

‎contrib/libxls/test/libxls_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
#include "contrib/libxls/utils/utils_libxls.h"
1717
#undef FILE // TODO(cblichmann): Artifact from generated header
1818

19+
#include "absl/status/status_matchers.h"
1920
#include "sandboxed_api/util/path.h"
2021
#include "sandboxed_api/util/status_matchers.h"
2122

2223
namespace {
2324

24-
using ::sapi::IsOk;
25+
using ::absl_testing::IsOk;
2526
using ::testing::Not;
2627

2728
struct Sheet {

‎contrib/libzip/test/test_zip.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <fstream>
1616

17+
#include "absl/status/status_matchers.h"
1718
#include "contrib/libzip/sandboxed.h"
1819
#include "contrib/libzip/utils/utils_zip.h"
1920
#include "sandboxed_api/util/path.h"
@@ -22,7 +23,7 @@
2223

2324
namespace {
2425

25-
using ::sapi::IsOk;
26+
using ::absl_testing::IsOk;
2627

2728
class ZipBase : public testing::Test {
2829
protected:

‎contrib/lodepng/examples/main_unit_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
#include "helpers.h" // NOLINT(build/include)
1616
#include "sandbox.h" // NOLINT(build/include)
1717
#include "gtest/gtest.h"
18+
#include "absl/status/status_matchers.h"
1819
#include "sandboxed_api/util/status_matchers.h"
1920

20-
using ::sapi::IsOk;
21+
using ::absl_testing::IsOk;
2122
using ::testing::Eq;
2223
using ::testing::IsTrue;
2324
using ::testing::NotNull;

‎contrib/turbojpeg/tests/turbojpeg_sapi_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
#include "gmock/gmock.h"
2626
#include "gtest/gtest.h"
27+
#include "absl/status/status_matchers.h"
2728
#include "sandboxed_api/testing.h"
2829
#include "sandboxed_api/util/fileops.h"
2930
#include "sandboxed_api/util/path.h"
@@ -32,7 +33,7 @@
3233

3334
namespace {
3435

35-
using ::sapi::IsOk;
36+
using ::absl_testing::IsOk;
3637
using ::testing::Eq;
3738
using ::testing::Gt;
3839
using ::testing::Not;

‎contrib/uriparser/test/test_uriparser.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <fstream>
1616

17+
#include "absl/status/status_matchers.h"
1718
#include "contrib/uriparser/sandboxed.h"
1819
#include "contrib/uriparser/utils/utils_uriparser.h"
1920
#include "sandboxed_api/util/path.h"
@@ -22,7 +23,7 @@
2223

2324
namespace {
2425

25-
using ::sapi::IsOk;
26+
using ::absl_testing::IsOk;
2627

2728
const struct TestVariant {
2829
std::string test;

‎contrib/woff2/woff2_sapi_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
#include "gmock/gmock.h"
2626
#include "gtest/gtest.h"
27+
#include "absl/status/status_matchers.h"
2728
#include "contrib/woff2/woff2_wrapper.h"
2829
#include "sandboxed_api/testing.h"
2930
#include "sandboxed_api/util/fileops.h"
@@ -33,7 +34,7 @@
3334

3435
namespace {
3536

36-
using ::sapi::IsOk;
37+
using ::absl_testing::IsOk;
3738
using ::testing::Eq;
3839
using ::testing::IsNull;
3940
using ::testing::Not;

‎contrib/zopfli/test/zopfli_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <fstream>
1818

19+
#include "absl/status/status_matchers.h"
1920
#include "contrib/zopfli/sandboxed.h"
2021
#include "contrib/zopfli/utils/utils_zopfli.h"
2122
#include "sandboxed_api/util/path.h"
@@ -24,7 +25,7 @@
2425

2526
namespace {
2627

27-
using ::sapi::IsOk;
28+
using ::absl_testing::IsOk;
2829
using ::testing::IsEmpty;
2930
using ::testing::Not;
3031

‎contrib/zstd/test/zstd_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "gmock/gmock.h"
2222
#include "gtest/gtest.h"
23+
#include "absl/status/status_matchers.h"
2324
#include "contrib/zstd/sandboxed.h"
2425
#include "contrib/zstd/utils/utils_zstd.h"
2526
#include "sandboxed_api/util/path.h"
@@ -28,7 +29,7 @@
2829

2930
namespace {
3031

31-
using ::sapi::IsOk;
32+
using ::absl_testing::IsOk;
3233

3334
std::string GetTestFilePath(const std::string& filename) {
3435
return sapi::file::JoinPath(getenv("TEST_FILES_DIR"), filename);

‎oss-internship-2020/curl/tests/tests.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
// limitations under the License.
1414

1515
#include "test_utils.h" // NOLINT(build/include)
16+
#include "absl/status/status_matchers.h"
1617
#include "sandboxed_api/util/status_matchers.h"
1718

1819
namespace curl::tests {
1920
namespace {
2021

21-
using ::sapi::IsOk;
22-
using ::sapi::StatusIs;
22+
using ::absl_testing::IsOk;
23+
using ::absl_testing::StatusIs;
2324
using ::testing::Eq;
2425
using ::testing::IsTrue;
2526

‎oss-internship-2020/libarchive/test/minitar_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616

1717
#include "sapi_minitar.h" // NOLINT(build/include)
1818
#include "gtest/gtest.h"
19+
#include "absl/status/status_matchers.h"
1920
#include "sandboxed_api/sandbox2/util.h"
2021
#include "sandboxed_api/util/fileops.h"
2122
#include "sandboxed_api/util/path.h"
2223
#include "sandboxed_api/util/status_matchers.h"
2324

2425
namespace {
2526

26-
using ::sapi::IsOk;
27+
using ::absl_testing::IsOk;
2728
using ::sapi::file::JoinPath;
2829
using ::sapi::file_util::fileops::Exists;
2930
using ::testing::Eq;

‎oss-internship-2020/libpng/tests/basic_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
#include "helper.h" // NOLINT(build/include)
1717
#include "libpng.h" // NOLINT(build/include)
1818
#include "gtest/gtest.h"
19+
#include "absl/status/status_matchers.h"
1920
#include "sandboxed_api/util/fileops.h"
2021
#include "sandboxed_api/util/path.h"
2122
#include "sandboxed_api/util/status_matchers.h"
2223
#include "sandboxed_api/util/temp_file.h"
2324

2425
namespace {
2526

26-
using ::sapi::IsOk;
27+
using ::absl_testing::IsOk;
2728
using ::testing::Eq;
2829
using ::testing::IsTrue;
2930

‎oss-internship-2020/libpng/tests/extended_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
#include "helper.h" // NOLINT(build/include)
2020
#include "libpng.h" // NOLINT(build/include)
2121
#include "gtest/gtest.h"
22+
#include "absl/status/status_matchers.h"
2223
#include "sandboxed_api/util/status_matchers.h"
2324

2425
namespace {
2526

26-
using ::sapi::IsOk;
27+
using ::absl_testing::IsOk;
2728
using ::testing::ContainerEq;
2829
using ::testing::Eq;
2930
using ::testing::Ge;

‎sandboxed_api/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ cc_test(
223223
"//sandboxed_api/util:thread",
224224
"@abseil-cpp//absl/log",
225225
"@abseil-cpp//absl/status",
226+
"@abseil-cpp//absl/status:status_matchers",
226227
"@abseil-cpp//absl/status:statusor",
227228
"@abseil-cpp//absl/strings:string_view",
228229
"@abseil-cpp//absl/time",

‎sandboxed_api/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ if(BUILD_TESTING AND SAPI_BUILD_TESTING AND NOT CMAKE_CROSSCOMPILING)
214214
)
215215
target_link_libraries(sapi_test PRIVATE
216216
absl::status
217+
absl::status_matchers
217218
absl::statusor
218219
absl::time
219220
benchmark

‎sandboxed_api/examples/stringop/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ cc_test(
7878
"@abseil-cpp//absl/log",
7979
"@abseil-cpp//absl/memory",
8080
"@abseil-cpp//absl/status",
81+
"@abseil-cpp//absl/status:status_matchers",
8182
"@abseil-cpp//absl/status:statusor",
8283
"@abseil-cpp//absl/strings:string_view",
8384
"@googletest//:gtest_main",

‎sandboxed_api/examples/stringop/main_stringop.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "absl/log/log.h"
2121
#include "absl/memory/memory.h"
2222
#include "absl/status/status.h"
23+
#include "absl/status/status_matchers.h"
2324
#include "absl/status/statusor.h"
2425
#include "absl/strings/string_view.h"
2526
#include "sandboxed_api/examples/stringop/stringop_params.pb.h"
@@ -32,7 +33,7 @@
3233

3334
namespace {
3435

35-
using ::sapi::IsOk;
36+
using ::absl_testing::IsOk;
3637
using ::testing::Eq;
3738
using ::testing::Ne;
3839
using ::testing::SizeIs;

‎sandboxed_api/sandbox2/BUILD

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ cc_test(
7777
"//sandboxed_api/sandbox2/util:bpf_helper",
7878
"//sandboxed_api/util:status_matchers",
7979
"@abseil-cpp//absl/log:check",
80+
"@abseil-cpp//absl/status:status_matchers",
8081
"@googletest//:gtest_main",
8182
],
8283
)
@@ -688,6 +689,7 @@ cc_test(
688689
"//sandboxed_api/util:status_matchers",
689690
"//sandboxed_api/util:temp_file",
690691
"@abseil-cpp//absl/status",
692+
"@abseil-cpp//absl/status:status_matchers",
691693
"@abseil-cpp//absl/strings",
692694
"@googletest//:gtest_main",
693695
],
@@ -877,6 +879,7 @@ cc_test(
877879
"@abseil-cpp//absl/log",
878880
"@abseil-cpp//absl/log:check",
879881
"@abseil-cpp//absl/status",
882+
"@abseil-cpp//absl/status:status_matchers",
880883
"@abseil-cpp//absl/strings",
881884
"@googletest//:gtest_main",
882885
],
@@ -995,6 +998,7 @@ cc_test(
995998
"//sandboxed_api/util:status_matchers",
996999
"//sandboxed_api/util:thread",
9971000
"@abseil-cpp//absl/status",
1001+
"@abseil-cpp//absl/status:status_matchers",
9981002
"@abseil-cpp//absl/status:statusor",
9991003
"@abseil-cpp//absl/strings",
10001004
"@abseil-cpp//absl/synchronization",
@@ -1039,7 +1043,7 @@ cc_test(
10391043
"//sandboxed_api/util:status_matchers",
10401044
"@abseil-cpp//absl/cleanup",
10411045
"@abseil-cpp//absl/log:check",
1042-
"@abseil-cpp//absl/status",
1046+
"@abseil-cpp//absl/status:status_matchers",
10431047
"@abseil-cpp//absl/status:statusor",
10441048
"@abseil-cpp//absl/strings",
10451049
"@abseil-cpp//absl/types:span",
@@ -1154,6 +1158,7 @@ cc_test(
11541158
"//sandboxed_api/sandbox2/network_proxy:testing",
11551159
"//sandboxed_api/util:status_matchers",
11561160
"@abseil-cpp//absl/status",
1161+
"@abseil-cpp//absl/status:status_matchers",
11571162
"@abseil-cpp//absl/time",
11581163
"@googletest//:gtest_main",
11591164
],

‎sandboxed_api/sandbox2/comms_test.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "absl/log/check.h"
3434
#include "absl/log/log.h"
3535
#include "absl/status/status.h"
36+
#include "absl/status/status_matchers.h"
3637
#include "absl/strings/string_view.h"
3738
#include "sandboxed_api/sandbox2/comms_test.pb.h"
3839
#include "sandboxed_api/util/status_matchers.h"
@@ -41,12 +42,13 @@
4142
namespace sandbox2 {
4243
namespace {
4344

44-
using ::sapi::IsOk;
45-
using ::sapi::StatusIs;
45+
using ::absl_testing::IsOk;
46+
using ::absl_testing::StatusIs;
4647
using ::testing::Eq;
4748
using ::testing::IsEmpty;
4849
using ::testing::IsFalse;
4950
using ::testing::IsTrue;
51+
using ::testing::Not;
5052

5153
using CommunicationHandler = std::function<void(Comms* comms)>;
5254

0 commit comments

Comments
 (0)