Skip to content

Commit da50201

Browse files
georgeajitgeorgeajit
authored andcommitted
No Task - Pulled in zero diff changes from develop that got removed.
1 parent 78e48e2 commit da50201

File tree

12 files changed

+691
-514
lines changed

12 files changed

+691
-514
lines changed

marklogic-client-api-functionaltests/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ test {
66
exclude 'com/marklogic/client/functionaltest/TestSSLConnection.class'
77
exclude 'com/marklogic/client/functionaltest/TestBug18993.class'
88
exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.class'
9+
exclude 'com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.class'
910
exclude 'com/marklogic/client/functionaltest/TestSandBox.class'
1011
}
1112

@@ -22,16 +23,12 @@ repositories {
2223
maven { url "http://developer.marklogic.com/maven2" }
2324
}
2425

25-
jacocoTestReport {
26-
group = "Reporting"
27-
description = "Generate Jacoco coverage reports after running tests."
28-
additionalSourceDirs = files(sourceSets.main.allJava.srcDirs)
29-
}
30-
3126
dependencies {
3227
compile project (':marklogic-client-api')
3328
compile group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
3429
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
3530
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
31+
compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'
32+
testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.3'
3633
compile group: 'commons-io', name: 'commons-io', version: '2.6'
3734
}

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTempMetaValues.java

Lines changed: 54 additions & 36 deletions
Large diffs are not rendered by default.

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ public static void setUpBeforeClass() throws Exception {
133133
validEndERIName);
134134
createDB(schemadbName);
135135
createForest(schemafNames[0], schemadbName);
136+
Thread.sleep(10000);
136137
// Set the schemadbName database as the Schema database.
137138
setDatabaseProperties(dbName, "schema-database", schemadbName);
139+
Thread.sleep(10000);
138140

139141
// Temporal axis must be created before temporal collection associated with
140142
// those axes is created
@@ -184,9 +186,12 @@ public void setUp() throws Exception {
184186
"xdbc:invoke", "temporal:statement-set-system-time");
185187
createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "temporal-admin");
186188
int restPort = getRestServerPort();
187-
adminClient = getDatabaseClientOnDatabase(appServerHostname, restPort, dbName, "rest-admin", "x", Authentication.DIGEST);
188-
writerClient = getDatabaseClientOnDatabase(appServerHostname, restPort, dbName, "eval-user", "x", Authentication.DIGEST);
189-
readerClient = getDatabaseClientOnDatabase(appServerHostname, restPort, dbName, "rest-reader", "x", Authentication.DIGEST);
189+
adminClient = getDatabaseClient("rest-admin", "x", Authentication.DIGEST);
190+
//adminClient = getDatabaseClientOnDatabase(appServerHostname, restPort, dbName, "rest-admin", "x", Authentication.DIGEST);
191+
//writerClient = getDatabaseClientOnDatabase(appServerHostname, restPort, dbName, "eval-user", "x", Authentication.DIGEST);
192+
writerClient = getDatabaseClient("eval-user", "x", Authentication.DIGEST);
193+
//readerClient = getDatabaseClientOnDatabase(appServerHostname, restPort, dbName, "rest-reader", "x", Authentication.DIGEST);
194+
readerClient = getDatabaseClient("rest-reader", "x", Authentication.DIGEST);
190195
}
191196

192197
@After
@@ -2166,8 +2171,10 @@ public void testPeriodRangeQuerySingleAxisBasedOnALNContains()
21662171
String docId = "javaSingleJSONDoc.json";
21672172

21682173
insertJSONSingleDocument(temporalCollectionName, docId, null);
2174+
Thread.sleep(20000);
21692175

21702176
updateJSONSingleDocument(temporalCollectionName, docId);
2177+
Thread.sleep(20000);
21712178

21722179
// Fetch documents associated with a search term (such as XML) in Address
21732180
// element
@@ -2185,10 +2192,12 @@ public void testPeriodRangeQuerySingleAxisBasedOnALNContains()
21852192
TemporalOperator.ALN_CONTAINS, period1));
21862193

21872194
long start = 1;
2195+
System.out.println("Query is " + periodQuery.serialize() );
21882196
JSONDocumentManager docMgr = readerClient.newJSONDocumentManager();
2189-
docMgr.setMetadataCategories(Metadata.ALL); // Get all metadata
2190-
DocumentPage termQueryResults = docMgr.search(periodQuery, start);
2191-
2197+
//docMgr.setMetadataCategories(Metadata.ALL); // Get all metadata
2198+
DocumentPage termQueryResults = docMgr.search(periodQuery, start);
2199+
Thread.sleep(20000);
2200+
21922201
long count = 0;
21932202
while (termQueryResults.hasNext()) {
21942203
++count;

0 commit comments

Comments
 (0)