summaryrefslogtreecommitdiffstats
path: root/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-10-29 12:03:47 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-10-29 12:03:47 +0100
commit4e479a0e71060390f8340acbd9b07fe85416510a (patch)
tree4c337fe6c98abfcd67671d942b81d5d1a532e5f1 /vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
parent7ca55cf2810664ee1acc4a79f606ff8e77868dc3 (diff)
Add traces to document/v1
Diffstat (limited to 'vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java')
-rw-r--r--vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java30
1 files changed, 26 insertions, 4 deletions
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
index 4aeb0c5f8cc..723c84935f1 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
@@ -43,6 +43,7 @@ import com.yahoo.documentapi.VisitorSession;
import com.yahoo.jdisc.Metric;
import com.yahoo.messagebus.StaticThrottlePolicy;
import com.yahoo.messagebus.Trace;
+import com.yahoo.messagebus.TraceNode;
import com.yahoo.metrics.simple.MetricReceiver;
import com.yahoo.searchdefinition.derived.Deriver;
import com.yahoo.slime.Inspector;
@@ -61,6 +62,7 @@ import java.io.UncheckedIOException;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.OptionalInt;
import java.util.TreeMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
@@ -320,11 +322,16 @@ public class DocumentV1ApiTest {
DocumentPut expectedPut = new DocumentPut(doc2);
expectedPut.setCondition(new TestAndSetCondition("test it"));
assertEquals(expectedPut, put);
- assertEquals(parameters(), parameters);
- parameters.responseHandler().get().handleResponse(new DocumentResponse(0, doc2));
+ assertEquals(parameters().withTraceLevel(9), parameters);
+ Trace trace = new Trace(9);
+ trace.trace(7, "Tracy Chapman", false);
+ trace.getRoot().addChild(new TraceNode().setStrict(false)
+ .addChild("Fast Car")
+ .addChild("Baby Can I Hold You"));
+ parameters.responseHandler().get().handleResponse(new DocumentResponse(0, doc2, trace));
return new Result(Result.ResultType.SUCCESS, null);
});
- response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two?condition=test%20it", POST,
+ response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two?condition=test%20it&traceLevel=9", POST,
"{" +
" \"fields\": {" +
" \"artist\": \"Asa-Chan & Jun-Ray\"" +
@@ -332,7 +339,22 @@ public class DocumentV1ApiTest {
"}");
assertSameJson("{" +
" \"pathId\": \"/document/v1/space/music/number/1/two\"," +
- " \"id\": \"id:space:music:n=1:two\"" +
+ " \"id\": \"id:space:music:n=1:two\"," +
+ " \"trace\": [" +
+ " {" +
+ " \"message\": \"Tracy Chapman\"" +
+ " }," +
+ " {" +
+ " \"fork\": [" +
+ " {" +
+ " \"message\": \"Fast Car\"" +
+ " }," +
+ " {" +
+ " \"message\": \"Baby Can I Hold You\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
"}", response.readAll());
assertEquals(200, response.getStatus());