Skip to content

Commit a765687

Browse files
committed
updated the test to create path range index before loading documents
1 parent 1eda1ed commit a765687

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

test-complete/src/test/java/com/marklogic/client/functionaltest/TestAutomatedPathRangeIndex.java

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,25 @@ public void testArtifactIndexedOnInt() throws Exception {
223223
public void testArtifactIndexedOnInteger() throws Exception {
224224
boolean succeeded = false;
225225
File jsonFile = null;
226+
try{GenerateIndexConfig.main(new String[] { "-classes",
227+
"com.marklogic.client.functionaltest.ArtifactIndexedOnInteger",
228+
"-file", "TestAutomatedPathRangeIndexInteger.json" });
229+
230+
jsonFile = new File("TestAutomatedPathRangeIndexInteger.json");
231+
ObjectMapper mapper = new ObjectMapper();
232+
JsonNode jnode = mapper.readValue(jsonFile, JsonNode.class);
233+
234+
if (!jnode.isNull()) {
235+
setPathRangeIndexInDatabase(dbName, jnode);
236+
succeeded = true;
237+
validateRangePathIndexInDatabase("range-path-index", "com.marklogic.client.functionaltest.ArtifactIndexedOnInteger/inventory");
238+
} else {
239+
assertTrue(
240+
"testArtifactIndexedOnInteger - No Json node available to insert into database",
241+
succeeded);
242+
}
243+
}catch(Exception e){ System.out.println(e.getMessage());}
244+
226245
PojoRepository<ArtifactIndexedOnInteger,String> products = client.newPojoRepository(ArtifactIndexedOnInteger.class, String.class);
227246
PojoPage<ArtifactIndexedOnInteger> pojoPage;
228247

@@ -231,24 +250,6 @@ public void testArtifactIndexedOnInteger() throws Exception {
231250

232251
PojoQueryBuilder<ArtifactIndexedOnInteger> qb = products.getQueryBuilder();
233252
try {
234-
GenerateIndexConfig.main(new String[] { "-classes",
235-
"com.marklogic.client.functionaltest.ArtifactIndexedOnInteger",
236-
"-file", "TestAutomatedPathRangeIndexInteger.json" });
237-
238-
jsonFile = new File("TestAutomatedPathRangeIndexInteger.json");
239-
ObjectMapper mapper = new ObjectMapper();
240-
JsonNode jnode = mapper.readValue(jsonFile, JsonNode.class);
241-
242-
if (!jnode.isNull()) {
243-
setPathRangeIndexInDatabase(dbName, jnode);
244-
succeeded = true;
245-
validateRangePathIndexInDatabase("range-path-index", "com.marklogic.client.functionaltest.ArtifactIndexedOnInteger/inventory");
246-
} else {
247-
assertTrue(
248-
"testArtifactIndexedOnInteger - No Json node available to insert into database",
249-
succeeded);
250-
}
251-
252253
PojoQueryDefinition qd = qb.range("inventory", Operator.GE,1055);
253254

254255
JacksonHandle jh = new JacksonHandle();
@@ -262,9 +263,9 @@ public void testArtifactIndexedOnInteger() throws Exception {
262263
* cts:search(fn:collection(), cts:and-query((cts:path-range-query("com.marklogic.client.functionaltest.ArtifactIndexedOnInteger/inv...", ">=", xs:int("1055"), (), 1),
263264
* cts:collection-query("com.marklogic.client.functionaltest.ArtifactIndexedOnInteger")), ()), ("unfiltered", cts:score-order("descending")), xs:double("0"), ())
264265
* -- No int path range index for com.marklogic.client.functionaltest.ArtifactIndexedOnInteger/inventory
265-
*
266+
* Thread.sleep(5000);
266267
*/
267-
Thread.sleep(5000);
268+
268269
pojoPage = products.search(qd, 1,jh);
269270

270271
assertEquals("total no of pages",1,pojoPage.getTotalPages());
@@ -284,7 +285,7 @@ public void testArtifactIndexedOnInteger() throws Exception {
284285
}while(!pojoPage.isLastPage() && pageNo<=pojoPage.getTotalSize());
285286

286287

287-
} catch (IOException e) {
288+
} catch (Exception e) {
288289
e.printStackTrace();
289290
} finally {
290291
try {

0 commit comments

Comments
 (0)