Merge pull request #750 from marklogic/feature/22604-disable-12-tests

MLE-22604 Disabling host certificate passphrase tests unless ML 12

Author: rjrudin

ml-app-deployer/build.gradle

@@ -35,4 +35,9 @@ dependencies {
 	testImplementation 'org.springframework:spring-test:6.2.8'
 	testImplementation 'commons-io:commons-io:2.19.0'
 	testImplementation 'xmlunit:xmlunit:1.6'
+
+	testImplementation ("com.marklogic:marklogic-junit5:1.5.0") {
+		// Use the version of ml-javaclient-util within this repository.
+		exclude module: "ml-javaclient-util"
+	}
 }

ml-app-deployer/src/test/java/com/marklogic/appdeployer/command/security/InsertHostCertificateTest.java

@@ -17,9 +17,11 @@
 
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
 import com.marklogic.appdeployer.ConfigDir;
+import com.marklogic.junit5.RequiresMarkLogic12;
 import com.marklogic.mgmt.resource.security.CertificateTemplateManager;
 import com.marklogic.rest.util.Fragment;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.client.HttpClientErrorException;
 
@@ -108,8 +110,8 @@ void insertCertificateAndVerify() {
 		}
 	}
 
-	// TODO Ideally don't log the request when it fails.
 	@Test
+	@ExtendWith(RequiresMarkLogic12.class)
 	void encryptedPrivateKey() {
 		appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/encrypted-private-key")));
 		appConfig.setHostCertificatePassphrases(Map.of("host3.marklogic.com", "password"));
@@ -130,6 +132,7 @@ void encryptedPrivateKey() {
 	}
 
 	@Test
+	@ExtendWith(RequiresMarkLogic12.class)
 	void encryptedPrivateKeyWithWrongPassphrase() {
 		appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/encrypted-private-key")));
 		appConfig.setHostCertificatePassphrases(Map.of("host3.marklogic.com", "wrong-passphrase"));
@@ -151,6 +154,7 @@ void encryptedPrivateKeyWithWrongPassphrase() {
 	}
 
 	@Test
+	@ExtendWith(RequiresMarkLogic12.class)
 	void encryptedPrivateKeyWithNoPassphrase() {
 		appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/encrypted-private-key")));
 

ml-app-deployer/src/test/java/com/marklogic/mgmt/AbstractMgmtTest.java

@@ -16,8 +16,11 @@
 package com.marklogic.mgmt;
 
 import com.marklogic.client.ext.helper.LoggingObject;
+import com.marklogic.junit5.MarkLogicVersion;
+import com.marklogic.junit5.MarkLogicVersionSupplier;
 import com.marklogic.mgmt.admin.AdminConfig;
 import com.marklogic.mgmt.admin.AdminManager;
+import com.marklogic.mgmt.resource.clusters.ClusterManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +32,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {TestConfig.class})
-public abstract class AbstractMgmtTest extends LoggingObject {
+public abstract class AbstractMgmtTest extends LoggingObject implements MarkLogicVersionSupplier {
 
 	@Autowired
 	protected ManageConfig manageConfig;
@@ -43,7 +46,23 @@ public abstract class AbstractMgmtTest extends LoggingObject {
 
 	@BeforeEach
 	public void initializeManageClient() {
-		manageClient = new ManageClient(manageConfig);
+		if (manageClient == null) {
+			manageClient = new ManageClient(manageConfig);
+		}
 		adminManager = new AdminManager(adminConfig);
 	}
+
+	/**
+	 * Allows for marklogic-junit5 annotations to be used that control test execution based on the MarkLogic version.
+	 *
+	 * @return
+	 */
+	@Override
+	public MarkLogicVersion getMarkLogicVersion() {
+		if (manageClient == null) {
+			manageClient = new ManageClient(manageConfig);
+		}
+		String version = new ClusterManager(manageClient).getVersion();
+		return new MarkLogicVersion(version);
+	}
 }