| Chunk |
|---|
| Conflicting content |
|---|
public void testMultiValued() throws Exception {
Document root = (Document) session.newRequest(FetchDocument.ID).set(
"value", "/").execute();
<<<<<<< HEAD
Document note = (Document) session.newRequest(CreateDocument.ID).setHeader(
"X-NXDocumentProperties", "*").setInput(root).set("type",
"Note").set("name", "mynote").set("properties",
"dc:contributors=me,other").execute();
checkHasCorrectContributors(note);
PaginableDocuments docs = (PaginableDocuments) session.newRequest(
DocumentPageProviderOperation.ID).setHeader(
"X-NXDocumentProperties", "*").set("query",
"SELECT * from Note").set("pageSize", 2).execute();
assertThat(docs, notNullValue());
assertThat(docs.size(), is(1));
checkHasCorrectContributors(docs.get(0));
=======
Document note = (Document) session.newRequest(CreateDocument.ID).setHeader(
"X-NXDocumentProperties", "*").setInput(root).set("type", "MV").set(
"name", "pfff").set("properties",
"mv:sl=s1,s2\nmv:ss=s1,s2\nmv:bl=true,false\nmv:b=true\n").execute();
checkHasCorrectMultiValues(note);
PaginableDocuments docs = (PaginableDocuments) session.newRequest(
DocumentPageProviderOperation.ID).setHeader(
"X-NXDocumentProperties", "*").set("query", "SELECT * from MV").set(
"pageSize", 2).execute();
assertThat(docs, notNullValue());
assertThat(docs.size(), is(1));
checkHasCorrectMultiValues(docs.get(0));
>>>>>>> 11c4690a09d475c456528e85f2ff8a020d58bf42
}
private void checkHasCorrectMultiValues(Document note) { |
| Solution content |
|---|
public void testMultiValued() throws Exception {
Document root = (Document) session.newRequest(FetchDocument.ID).set(
"value", "/").execute();
Document note = (Document) session.newRequest(CreateDocument.ID).setHeader(
"X-NXDocumentProperties", "*").setInput(root).set("type", "MV").set(
"name", "pfff").set("properties",
"mv:sl=s1,s2\nmv:ss=s1,s2\nmv:bl=true,false\nmv:b=true\n").execute();
checkHasCorrectMultiValues(note);
PaginableDocuments docs = (PaginableDocuments) session.newRequest(
DocumentPageProviderOperation.ID).setHeader(
"X-NXDocumentProperties", "*").set("query", "SELECT * from MV").set(
"pageSize", 2).execute();
assertThat(docs, notNullValue());
assertThat(docs.size(), is(1));
checkHasCorrectMultiValues(docs.get(0));
}
private void checkHasCorrectMultiValues(Document note) { |
| File |
|---|
| RestTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Cast expression |
| Method invocation |
| Variable |