Skip to content

Commit f7f622f

Browse files
tensorflower-gardenertensorflow-copybara
tensorflower-gardener
authored and
tensorflow-copybara
committed
Automated Code Change
PiperOrigin-RevId: 786173938
1 parent 9fb3248 commit f7f622f

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

‎tensorflow_serving/util/json_tensor_test.cc‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ TEST(JsontensorTest, DeeplyNestedMalformed) {
114114
json_req.append("}");
115115
auto status =
116116
FillPredictRequestFromJson(json_req, getmap(infomap), &req, &format);
117-
ASSERT_TRUE(errors::IsInvalidArgument(status));
117+
ASSERT_TRUE(absl::IsInvalidArgument(status));
118118
EXPECT_THAT(status.message(), HasSubstr("key must be a string value"));
119119
}
120120

@@ -648,7 +648,7 @@ TEST(JsontensorTest, SingleUnnamedTensorErrors) {
648648
JsonPredictRequestFormat format;
649649
absl::Status status;
650650
status = FillPredictRequestFromJson("", getmap(infomap), &req, &format);
651-
ASSERT_TRUE(errors::IsInvalidArgument(status));
651+
ASSERT_TRUE(absl::IsInvalidArgument(status));
652652
EXPECT_THAT(status.message(), HasSubstr("document is empty"));
653653

654654
status = FillPredictRequestFromJson(R"(
@@ -657,7 +657,7 @@ TEST(JsontensorTest, SingleUnnamedTensorErrors) {
657657
"instances": [[1,2],[3,4],[5,6,7]]
658658
})",
659659
getmap(infomap), &req, &format);
660-
ASSERT_TRUE(errors::IsInvalidArgument(status));
660+
ASSERT_TRUE(absl::IsInvalidArgument(status));
661661
EXPECT_THAT(status.message(), HasSubstr("must be a string value"));
662662

663663
status = FillPredictRequestFromJson(R"(
@@ -666,39 +666,39 @@ TEST(JsontensorTest, SingleUnnamedTensorErrors) {
666666
"inputs": [[1,2],[3,4],[5,6,7]]
667667
})",
668668
getmap(infomap), &req, &format);
669-
ASSERT_TRUE(errors::IsInvalidArgument(status));
669+
ASSERT_TRUE(absl::IsInvalidArgument(status));
670670
EXPECT_THAT(status.message(), HasSubstr("Not formatted correctly"));
671671

672672
status = FillPredictRequestFromJson(R"(
673673
{
674674
"instances": [[1,2],[3,4],[5,6,7]]
675675
})",
676676
getmap(infomap), &req, &format);
677-
ASSERT_TRUE(errors::IsInvalidArgument(status));
677+
ASSERT_TRUE(absl::IsInvalidArgument(status));
678678
EXPECT_THAT(status.message(), HasSubstr("Expecting tensor size"));
679679

680680
status = FillPredictRequestFromJson(R"(
681681
{
682682
"instances": [[1,2],[3,4],[[5,6]]]
683683
})",
684684
getmap(infomap), &req, &format);
685-
ASSERT_TRUE(errors::IsInvalidArgument(status));
685+
ASSERT_TRUE(absl::IsInvalidArgument(status));
686686
EXPECT_THAT(status.message(), HasSubstr("Expecting shape"));
687687

688688
status = FillPredictRequestFromJson(R"(
689689
{
690690
"instances": [1, [1]]
691691
})",
692692
getmap(infomap), &req, &format);
693-
ASSERT_TRUE(errors::IsInvalidArgument(status));
693+
ASSERT_TRUE(absl::IsInvalidArgument(status));
694694
EXPECT_THAT(status.message(), HasSubstr("Expecting shape"));
695695

696696
status = FillPredictRequestFromJson(R"(
697697
{
698698
"instances": [[1,2],["a", "b"]]
699699
})",
700700
getmap(infomap), &req, &format);
701-
ASSERT_TRUE(errors::IsInvalidArgument(status));
701+
ASSERT_TRUE(absl::IsInvalidArgument(status));
702702
EXPECT_THAT(status.message(), HasSubstr("not of expected type"));
703703
}
704704

@@ -729,7 +729,7 @@ TEST(JsontensorTest, MultipleNamedTensorErrors) {
729729
]
730730
})",
731731
getmap(infomap), &req, &format);
732-
ASSERT_TRUE(errors::IsInvalidArgument(status));
732+
ASSERT_TRUE(absl::IsInvalidArgument(status));
733733
EXPECT_THAT(status.message(), HasSubstr("Expecting shape"));
734734

735735
// Different size/length across int_tensor instances.
@@ -748,7 +748,7 @@ TEST(JsontensorTest, MultipleNamedTensorErrors) {
748748
]
749749
})",
750750
getmap(infomap), &req, &format);
751-
ASSERT_TRUE(errors::IsInvalidArgument(status));
751+
ASSERT_TRUE(absl::IsInvalidArgument(status));
752752
EXPECT_THAT(status.message(), HasSubstr("Expecting tensor size"));
753753

754754
// Mix of object and value/list in "instances" list.
@@ -769,7 +769,7 @@ TEST(JsontensorTest, MultipleNamedTensorErrors) {
769769
]
770770
})",
771771
getmap(infomap), &req, &format);
772-
ASSERT_TRUE(errors::IsInvalidArgument(status));
772+
ASSERT_TRUE(absl::IsInvalidArgument(status));
773773
EXPECT_THAT(status.message(), HasSubstr("Expecting object but got list"));
774774

775775
// Mix of object and value/list in "instances" list.
@@ -788,7 +788,7 @@ TEST(JsontensorTest, MultipleNamedTensorErrors) {
788788
]
789789
})",
790790
getmap(infomap), &req, &format);
791-
ASSERT_TRUE(errors::IsInvalidArgument(status));
791+
ASSERT_TRUE(absl::IsInvalidArgument(status));
792792
EXPECT_THAT(status.message(),
793793
HasSubstr("Expecting value/list but got object"));
794794
}
@@ -980,7 +980,7 @@ TEST(JsontensorTest, FromJsonSingleTensorErrors) {
980980

981981
status =
982982
MakeJsonFromTensors(tensormap, JsonPredictRequestFormat::kRow, &json);
983-
ASSERT_TRUE(errors::IsInvalidArgument(status));
983+
ASSERT_TRUE(absl::IsInvalidArgument(status));
984984
EXPECT_THAT(status.message(), HasSubstr("empty tensor map"));
985985

986986
ASSERT_TRUE(TextFormat::ParseFromString(R"(
@@ -994,7 +994,7 @@ TEST(JsontensorTest, FromJsonSingleTensorErrors) {
994994
&tensormap["tensor"]));
995995
status =
996996
MakeJsonFromTensors(tensormap, JsonPredictRequestFormat::kRow, &json);
997-
ASSERT_TRUE(errors::IsInvalidArgument(status));
997+
ASSERT_TRUE(absl::IsInvalidArgument(status));
998998
EXPECT_THAT(status.message(), HasSubstr("tensor type: complex64"));
999999

10001000
ASSERT_TRUE(TextFormat::ParseFromString(R"(
@@ -1004,7 +1004,7 @@ TEST(JsontensorTest, FromJsonSingleTensorErrors) {
10041004
&tensormap["tensor"]));
10051005
status =
10061006
MakeJsonFromTensors(tensormap, JsonPredictRequestFormat::kRow, &json);
1007-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1007+
ASSERT_TRUE(absl::IsInvalidArgument(status));
10081008
EXPECT_THAT(status.message(), HasSubstr("no shape information"));
10091009
}
10101010

@@ -1146,7 +1146,7 @@ TEST(JsontensorTest, FromJsonMultipleNamedTensorsErrors) {
11461146
string json;
11471147
const auto& status =
11481148
MakeJsonFromTensors(tensormap, JsonPredictRequestFormat::kRow, &json);
1149-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1149+
ASSERT_TRUE(absl::IsInvalidArgument(status));
11501150
EXPECT_THAT(status.message(), HasSubstr("inconsistent batch size"));
11511151
}
11521152

@@ -1220,7 +1220,7 @@ TEST(JsontensorTest, FromJsonMultipleZeroBatchTensorsErrors) {
12201220
string json;
12211221
const auto& status =
12221222
MakeJsonFromTensors(tensormap, JsonPredictRequestFormat::kRow, &json);
1223-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1223+
ASSERT_TRUE(absl::IsInvalidArgument(status));
12241224
EXPECT_THAT(status.message(), HasSubstr("inconsistent batch size"));
12251225
}
12261226

@@ -1450,7 +1450,7 @@ TYPED_TEST(ClassifyRegressRequestTest, JsonErrors) {
14501450
"examples": [ { "names": [ "foo", "bar" ] } ]
14511451
})",
14521452
&req);
1453-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1453+
ASSERT_TRUE(absl::IsInvalidArgument(status));
14541454
EXPECT_THAT(status.message(),
14551455
HasSubstr("'signature_name' key must be a string"));
14561456

@@ -1460,7 +1460,7 @@ TYPED_TEST(ClassifyRegressRequestTest, JsonErrors) {
14601460
"context": [ { "names": [ "foo", "bar" ] } ]
14611461
})",
14621462
&req);
1463-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1463+
ASSERT_TRUE(absl::IsInvalidArgument(status));
14641464
EXPECT_THAT(status.message(), HasSubstr("Example must be JSON object"));
14651465

14661466
req.Clear();
@@ -1469,7 +1469,7 @@ TYPED_TEST(ClassifyRegressRequestTest, JsonErrors) {
14691469
"examples": { "names": [ "foo", "bar" ] }
14701470
})",
14711471
&req);
1472-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1472+
ASSERT_TRUE(absl::IsInvalidArgument(status));
14731473
EXPECT_THAT(status.message(), HasSubstr("list/array"));
14741474

14751475
req.Clear();
@@ -1478,7 +1478,7 @@ TYPED_TEST(ClassifyRegressRequestTest, JsonErrors) {
14781478
"examples": [ [ { "names": [ "foo", "bar" ] } ] ]
14791479
})",
14801480
&req);
1481-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1481+
ASSERT_TRUE(absl::IsInvalidArgument(status));
14821482
EXPECT_THAT(status.message(), HasSubstr("Example must be JSON object"));
14831483

14841484
req.Clear();
@@ -1487,7 +1487,7 @@ TYPED_TEST(ClassifyRegressRequestTest, JsonErrors) {
14871487
"examples": [ { "names": [ 10, null ] } ]
14881488
})",
14891489
&req);
1490-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1490+
ASSERT_TRUE(absl::IsInvalidArgument(status));
14911491
EXPECT_THAT(status.message(),
14921492
HasSubstr("names has element with unexpected JSON type: Null"));
14931493

@@ -1497,7 +1497,7 @@ TYPED_TEST(ClassifyRegressRequestTest, JsonErrors) {
14971497
"examples": [ { "names": [ 10, 10.0 ] } ]
14981498
})",
14991499
&req);
1500-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1500+
ASSERT_TRUE(absl::IsInvalidArgument(status));
15011501
EXPECT_THAT(status.message(),
15021502
HasSubstr("feature: names expecting type: int64"));
15031503

@@ -1507,7 +1507,7 @@ TYPED_TEST(ClassifyRegressRequestTest, JsonErrors) {
15071507
"examples": [ { "names": [ 10, { "test": 10 } ] } ]
15081508
})",
15091509
&req);
1510-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1510+
ASSERT_TRUE(absl::IsInvalidArgument(status));
15111511
EXPECT_THAT(status.message(),
15121512
HasSubstr("names has element with unexpected JSON type: Object"));
15131513

@@ -1517,7 +1517,7 @@ TYPED_TEST(ClassifyRegressRequestTest, JsonErrors) {
15171517
"examples": [ { "names": [ [10], 20 ] } ]
15181518
})",
15191519
&req);
1520-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1520+
ASSERT_TRUE(absl::IsInvalidArgument(status));
15211521
EXPECT_THAT(status.message(),
15221522
HasSubstr("names has element with unexpected JSON type: Array"));
15231523

@@ -1527,7 +1527,7 @@ TYPED_TEST(ClassifyRegressRequestTest, JsonErrors) {
15271527
"examples": [ { "names": [ 20, 18446744073709551603 ] } ]
15281528
})",
15291529
&req);
1530-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1530+
ASSERT_TRUE(absl::IsInvalidArgument(status));
15311531
EXPECT_THAT(status.message(), HasSubstr("Only int64_t is supported"));
15321532
}
15331533

@@ -1590,11 +1590,11 @@ TEST(ClassifyRegressnResultTest, JsonFromRegressionResultWithNonFinite) {
15901590
TEST(ClassifyRegressnResultTest, JsonFromResultErrors) {
15911591
string json;
15921592
auto status = MakeJsonFromClassificationResult(ClassificationResult(), &json);
1593-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1593+
ASSERT_TRUE(absl::IsInvalidArgument(status));
15941594
EXPECT_THAT(status.message(), HasSubstr("empty ClassificationResults"));
15951595

15961596
status = MakeJsonFromRegressionResult(RegressionResult(), &json);
1597-
ASSERT_TRUE(errors::IsInvalidArgument(status));
1597+
ASSERT_TRUE(absl::IsInvalidArgument(status));
15981598
EXPECT_THAT(status.message(), HasSubstr("empty RegressionResults"));
15991599
}
16001600

0 commit comments

Comments
 (0)