Skip to content

Commit eba111a

Browse files
MarkLogic BuilderMarkLogic Builder
authored andcommitted
Merge branch 'dev' of https://github.com/marklogic/java-client-api into newRegressionTests
2 parents 6b8c536 + eb4f1f2 commit eba111a

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

src/main/java/com/marklogic/client/impl/ExtensionLibrariesManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void setHandleRegistry(HandleFactoryRegistry handleRegistry) {
4444
@Override
4545
public ExtensionLibraryDescriptor[] list()
4646
throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException {
47-
return list("/ext/");
47+
return list("/ext");
4848
}
4949
@Override
5050
public ExtensionLibraryDescriptor[] list(String directory)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public void testJSONRuleDefinitions()
309309
BytesHandle bHandle = ruleManager.readRule("javatestrule",
310310
new BytesHandle().withFormat(Format.JSON));
311311
assertEquals(
312-
"{\"rule\":{\"name\":\"javatestrule\", \"description\":\"rule to demonstrate REST alerting\", \"search\":{\"qtext\":[\"favorited:true\"], \"options\":{\"constraint\":[{\"name\":\"favorited\", \"value\":{\"element\":{\"ns\":\"\", \"name\":\"favorited\"}}}]}}, \"rule-metadata\":null}}",
312+
"{\"rule\":{\"name\":\"javatestrule\", \"description\":\"rule to demonstrate REST alerting\", \"search\":{\"qtext\":[\"favorited:true\"], \"options\":{\"constraint\":[{\"name\":\"favorited\", \"value\":{\"element\":{\"ns\":\"\", \"name\":\"favorited\"}}}]}}, \"rule-metadata\":null}}\n",
313313
new String(bHandle.get()));
314314

315315
ruleManager.delete("javatestrule");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public void testXQueryModuleCRUD()
2424
throws ResourceNotFoundException, ResourceNotResendableException, ForbiddenUserException, FailedRequestException {
2525

2626
Common.connectAdmin();
27+
//System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.wire", "debug");
2728

2829
// get a manager
2930
ExtensionLibrariesManager libsMgr = Common.client

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ public void testB_ReadPojos() throws Exception {
9090
}
9191

9292
@Test
93-
// most of the queries below currently don't work because of issues in the search:search layer
94-
// but the numbers expected come from working queries at the cts:search layer
93+
// the geo queries below currently don't work yet because underlying layers are not yet ready
9594
public void testC_QueryPojos() throws Exception {
9695
StringQueryDefinition stringQuery = Common.client.newQueryManager().newStringDefinition();
9796
stringQuery.setCriteria("Tungi OR Dalatando OR Chittagong");
@@ -162,6 +161,7 @@ public void testC_QueryPojos() throws Exception {
162161
iterator = page.iterator();
163162
numRead = 0;
164163
while ( iterator.hasNext() ) {
164+
@SuppressWarnings("unused")
165165
City city = iterator.next();
166166
numRead++;
167167
}
@@ -178,6 +178,7 @@ public void testC_QueryPojos() throws Exception {
178178
iterator = page.iterator();
179179
numRead = 0;
180180
while ( iterator.hasNext() ) {
181+
@SuppressWarnings("unused")
181182
City city = iterator.next();
182183
numRead++;
183184
}
@@ -194,6 +195,7 @@ public void testC_QueryPojos() throws Exception {
194195
iterator = page.iterator();
195196
numRead = 0;
196197
while ( iterator.hasNext() ) {
198+
@SuppressWarnings("unused")
197199
City city = iterator.next();
198200
numRead++;
199201
}

0 commit comments

Comments
 (0)