Skip to content

Commit e231f73

Browse files
committed
Fixing TestBiTempMetaValues
Didn't need to try to delete temporal axes since the schema db was being deleted.
1 parent 43d0dfa commit e231f73

File tree

3 files changed

+3
-26
lines changed

3 files changed

+3
-26
lines changed

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -707,11 +707,6 @@ public static void updateTemporalCollectionForLSQT(String dbName, String collect
707707
new TemporalCollectionLSQTManager(newManageClient(), dbName, collectionName).save(rootNode.toString());
708708
}
709709

710-
// Delete a temporal collection
711-
public static void deleteElementRangeIndexTemporalCollection(String dbName, String collectionName) {
712-
new TemporalCollectionManager(newManageClient(), dbName).deleteByIdField(collectionName);
713-
}
714-
715710
public static ObjectNode newServerPayload(String serverName) {
716711
ObjectNode payload = new ObjectMapper().createObjectNode();
717712
payload.put("server-name", serverName);
@@ -743,7 +738,7 @@ public static String getServerAuthentication(String serverName) {
743738
}
744739
}
745740

746-
public static void setupServerRequestLogging(DatabaseClient client, boolean flag) throws Exception {
741+
public static void setupServerRequestLogging(DatabaseClient client, boolean flag) {
747742
ServerConfigurationManager scm = client.newServerConfigManager();
748743
scm.readConfiguration();
749744
scm.setServerRequestLogging(flag);
@@ -774,11 +769,11 @@ public static SSLContext getSslContext() throws IOException, NoSuchAlgorithmExce
774769
// (note: a real application should verify certificates)
775770

776771
TrustManager tm = new X509TrustManager() {
777-
public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
772+
public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
778773
// nothing to do
779774
}
780775

781-
public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
776+
public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
782777
// nothing to do
783778
}
784779

@@ -794,11 +789,6 @@ public X509Certificate[] getAcceptedIssuers() {
794789
KeyStore keyStore = KeyStore.getInstance("PKCS12");
795790
Properties property = new Properties();
796791
InputStream keyInput = property.getClass().getResourceAsStream(mlCertFile);
797-
// try {
798-
// Thread.sleep(2000);
799-
// } catch (InterruptedException e) {
800-
// e.printStackTrace();
801-
// }
802792

803793
try {
804794
keyStore.load(keyInput, ml_certificate_password.toCharArray());

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,11 @@ public static void setUpBeforeClass() throws Exception {
109109
public static void tearDownAfterClass() throws Exception {
110110
System.out.println("In tear down");
111111

112-
// Delete database first. Otherwise axis and collection cannot be deleted
113112
cleanupRESTServer(dbName, fNames);
114113
deleteRESTUser("eval-bitemp-meta-user");
115114
deleteRESTUser("eval-readeruser");
116115
deleteUserRole("test-eval-bitemp");
117116
deleteUserRole("replaceRoleTest");
118-
119-
// Temporal collection needs to be deleted before temporal axis associated
120-
// with it can be deleted
121-
ConnectedRESTQA.deleteElementRangeIndexTemporalCollection(dbName,
122-
temporalLsqtCollectionName);
123-
ConnectedRESTQA.deleteElementRangeIndexTemporalCollection(dbName,
124-
temporalCollectionName);
125-
ConnectedRESTQA.deleteElementRangeIndexTemporalCollection(dbName,
126-
bulktemporalCollectionName);
127117
deleteDB(schemadbName);
128118
}
129119

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2672,9 +2672,6 @@ public void testInsertDocumentUsingDocumentURIAsCollectionName()
26722672
assertTrue((statusCode == 400));
26732673
}
26742674

2675-
ConnectedRESTQA.deleteElementRangeIndexTemporalCollection("Documents",
2676-
jsonDocId);
2677-
26782675
assertTrue(exceptionThrown, "Exception not thrown for invalid temporal collection");
26792676
}
26802677

0 commit comments

Comments
 (0)