#432 Fixes for amp tests

Author: rjrudin

.gitignore

@@ -16,3 +16,4 @@ target
 gradle-local.properties
 snyk
 .vscode
+src/test/resources/sample-app/build

src/test/java/com/marklogic/appdeployer/command/forests/BuildForestReplicaTest.java

@@ -179,10 +179,11 @@ public void hostIsAdded() {
 		assertEquals(1, forests.size());
 		assertEquals("testdb-4-replica-1", forests.get(0).getForestReplica().get(0).getReplicaName());
 		assertEquals(
+			"host1", forests.get(0).getForestReplica().get(0).getHost(),
 			"When adding a new host and creating replicas, the replicas will naturally be uneven because the existing " +
 				"forests on hosts 1, 2, and 3 won't have their replicas moved to 4 automatically, and thus host 4 won't " +
-				"have any replicas on it. And for the new replicas, we expect those to start being created on the first host.",
-			"host1", forests.get(0).getForestReplica().get(0).getHost());
+				"have any replicas on it. And for the new replicas, we expect those to start being created on the first host."
+		);
 	}
 
 	@Test

src/test/java/com/marklogic/appdeployer/command/security/ManageAmpsTest.java

@@ -1,5 +1,6 @@
 package com.marklogic.appdeployer.command.security;
 
+import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.appdeployer.command.AbstractManageResourceTest;
 import com.marklogic.appdeployer.command.Command;
 import com.marklogic.appdeployer.command.modules.LoadModulesCommand;
@@ -12,12 +13,16 @@
 import com.marklogic.mgmt.resource.security.AmpManager;
 import org.junit.jupiter.api.Test;
 
+import java.io.File;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 public class ManageAmpsTest extends AbstractManageResourceTest {
 
 	@Test
 	public void ampLoadedBeforeModules() {
+		appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/real-amp")));
+
 		initializeAppDeployer(new DeployUsersCommand(), new DeployRestApiServersCommand(true),
 			new DeployAmpsCommand(), new LoadModulesCommand());
 		appConfig.setModuleTimestampsPath(null);

src/test/resources/sample-app/build/ml-javaclient-util/module-timestamps.properties

@@ -0,0 +1,7 @@
+{
+	"namespace": "urn:sampleapp",
+	"local-name": "get-host-status",
+	"document-uri": "/ext/sample-lib.xqy",
+	"modules-database": "%%MODULES_DATABASE%%",
+	"role": ["admin"]
+}

src/test/resources/sample-app/build/mlRestApi/some-library/ml-modules/ext/some-lib.xqy

@@ -1,7 +1,7 @@
 {
-  "namespace": "urn:sampleapp",
-  "local-name": "get-host-status",
-  "document-uri": "/ext/sample-lib.xqy",
-  "modules-database": "%%MODULES_DATABASE%%",
-  "role": ["admin"]
+	"namespace": "http://example.com/uri",
+	"local-name": "ml-app-deployer-test-1",
+	"document-uri": "/module/path/name",
+	"modules-database": "Modules",
+	"role": ["app-user"]
 }