Skip to content

Commit e1582de

Browse files
committed
fix #240, test failing because permissions must now be set on persisted options
1 parent bbbd4d6 commit e1582de

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

src/test/java/com/marklogic/client/test/PojoFacadeTest.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@
3434
import com.fasterxml.jackson.databind.ObjectMapper;
3535
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
3636
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
37+
import com.marklogic.client.DatabaseClient;
3738
import com.marklogic.client.ResourceNotFoundException;
39+
import com.marklogic.client.admin.QueryOptionsManager;
3840
import com.marklogic.client.impl.PojoRepositoryImpl;
41+
import com.marklogic.client.io.Format;
42+
import com.marklogic.client.io.StringHandle;
3943
import com.marklogic.client.pojo.PojoPage;
4044
import com.marklogic.client.pojo.PojoQueryBuilder;
4145
import com.marklogic.client.pojo.PojoQueryBuilder.Operator;
@@ -284,8 +288,11 @@ public void testC_QueryPojos() throws Exception {
284288
assertEquals("Failed to find number of records expected", 1, numRead);
285289
assertEquals("PojoPage failed to report number of records expected", numRead, page.size());
286290

287-
// - then let's show the old work-around using stored options which contain
288-
// <search-option>filtered</search-option>
291+
// - then let's show the old work-around using stored options
292+
QueryOptionsManager queryOptionsMgr =
293+
Common.newAdminClient().newServerConfigManager().newQueryOptionsManager();
294+
queryOptionsMgr.writeOptions("filtered",
295+
new StringHandle("{\"options\":{\"search-option\":\"filtered\"}}").withFormat(Format.JSON));
289296
StructuredQueryBuilder sqb = Common.client.newQueryManager().newStructuredQueryBuilder("filtered");
290297
query = sqb.and(qb.word("asciiName", new String[] {"wildcarded"}, 1, "Chittagong*"));
291298
page = cities.search(query, 1);

src/test/resources/bootstrap.xqy

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,16 +1072,7 @@ xdmp:document-set-permissions("/sample/tuples-test4.xml",
10721072
),
10731073
xdmp:document-add-collections("/sample2/suggestion.xml",("http://some.org/suggestions"))
10741074
'
1075-
),
1076-
xdmp:eval('xquery version "1.0-ml";
1077-
xdmp:document-insert("/Default/java-unittest/rest-api/options/filtered.xml",
1078-
<options xmlns="http://marklogic.com/appservices/search">
1079-
<search-option>filtered</search-option>
1080-
</options>
1081-
)', (),
1082-
<options xmlns="xdmp:eval">
1083-
<database>{ xdmp:database("java-unittest-modules") }</database>
1084-
</options>)
1075+
)
10851076
};
10861077

10871078
declare function bootstrap:load-search-data()

0 commit comments

Comments
 (0)