diff options
author | Tor Brede Vekterli <vekterli@oath.com> | 2017-12-07 10:41:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-07 10:41:55 +0100 |
commit | ff0e8671bb8e4d58ae424cdce791bbe61eb3eb8b (patch) | |
tree | 1affbc75f30adf87675b0cdf51f16fc9b09bf610 /storage/src/tests/distributor | |
parent | 1c346b4541f5f954e7fb594a30c2e0c10e5c157a (diff) | |
parent | 5519e892e22c7f6fd8da068ff7ab876ee3161faf (diff) |
Merge pull request #4126 from vespa-engine/vekterli/move-to-flex-bison-parsing-for-document-selection-rebased
Use new C++ document selection parser
Diffstat (limited to 'storage/src/tests/distributor')
-rw-r--r-- | storage/src/tests/distributor/twophaseupdateoperationtest.cpp | 8 | ||||
-rw-r--r-- | storage/src/tests/distributor/visitoroperationtest.cpp | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp index a7418629f81..16d317551e0 100644 --- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp +++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp @@ -1070,9 +1070,8 @@ TwoPhaseUpdateOperationTest::testSafePathConditionParseFailureFailsWithIllegalPa "timestamp 0, timestamp of updated doc: 0) " "ReturnCode(ILLEGAL_PARAMETERS, " "Failed to parse test and set condition: " - "Unexpected token at position 16 " - "('==fran...c') in query 'testdoctype1." - "san==fran...cisco',)"s, + "syntax error, unexpected . at column 24 when " + "parsing selection 'testdoctype1.san==fran...cisco')"s, sender.getLastReply(true)); } @@ -1096,7 +1095,8 @@ TwoPhaseUpdateOperationTest::testSafePathConditonUnknownDocTypeFailsWithIllegalP "timestamp 0, timestamp of updated doc: 0) " "ReturnCode(ILLEGAL_PARAMETERS, " "Failed to parse test and set condition: " - "Document type langbein not found)"s, + "Document type 'langbein' not found at column 1 " + "when parsing selection 'langbein.headerval=1234')"s, sender.getLastReply(true)); } diff --git a/storage/src/tests/distributor/visitoroperationtest.cpp b/storage/src/tests/distributor/visitoroperationtest.cpp index 26f4fb3e784..972ccf41bfe 100644 --- a/storage/src/tests/distributor/visitoroperationtest.cpp +++ b/storage/src/tests/distributor/visitoroperationtest.cpp @@ -454,7 +454,8 @@ VisitorOperationTest::testInvalidOrderDocSelection() CPPUNIT_ASSERT_EQUAL( std::string("CreateVisitorReply(last=BucketId(0x0000000000000000)) " "ReturnCode(ILLEGAL_PARAMETERS, Failed to parse document select " - "string 'id.order(10,3)=1 and dummy': Document type dummy not found)"), + "string 'id.order(10,3)=1 and dummy': Document type 'dummy' not " + "found at column 22 when parsing selection 'id.order(10,3)=1 and dummy')"), runEmptyVisitor( createVisitorCommand("invalidOrderDoc", id, |