#164 Fixing test for custom forests, was ignored

src/main/java/com/marklogic/appdeployer/command/databases/DeployContentDatabasesCommand.java

@@ -41,7 +41,7 @@ public void execute(CommandContext context) {
         if (count != null) {
             this.setForestsPerHost(count);
         }
-        
+
         super.execute(context);
 
         AppConfig appConfig = context.getAppConfig();
@@ -51,7 +51,13 @@ public void execute(CommandContext context) {
                 DatabaseManager dbMgr = new DatabaseManager(context.getManageClient());
                 String json = tokenReplacer.replaceTokens(payload, appConfig, true);
                 SaveReceipt receipt = dbMgr.save(json);
-                buildDeployForestsCommand(payload, receipt, context).execute(context);
+	            if (shouldCreateForests(context, payload)) {
+		            buildDeployForestsCommand(payload, receipt, context).execute(context);
+	            } else {
+		            if (logger.isInfoEnabled()) {
+			            logger.info("Found custom forests for database, so not creating default forests");
+		            }
+	            }
             }
         }
     }

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

@@ -5,15 +5,13 @@
 import com.marklogic.appdeployer.command.databases.DeployContentDatabasesCommand;
 import com.marklogic.mgmt.forests.ForestManager;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
 
 /**
  * Verifies that directories under ./forests/ are processed correctly.
  */
-@Ignore("Failing on travis because it's not using the right hostname for forests, not sure how to fix yet")
 public class DeployCustomForestsTest extends AbstractAppDeployerTest {
 
 	@After
@@ -23,17 +21,13 @@ public void tearDown() {
 
 	@Test
 	public void test() {
-		// To avoid hardcoding host names that might cause the test to fail, we use a custom token and assume that
-		// the host of the Management API will work
-		appConfig.getCustomTokens().put("%%CUSTOM_HOST%%", super.manageConfig.getHost());
-
 		appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/custom-forests")));
 
 		initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeployCustomForestsCommand());
 		deploySampleApp();
 
 		ForestManager mgr = new ForestManager(manageClient);
-		assertTrue("One 'simple' forest should have been created by default", mgr.exists("sample-app-content-1"));
+		assertFalse("A default forest should not have been created since custom forests exist", mgr.exists("sample-app-content-1"));
 		assertTrue(mgr.exists("sample-app-content-custom-1"));
 		assertTrue(mgr.exists("sample-app-content-custom-2"));
 		assertTrue(mgr.exists("sample-app-content-custom-3"));

src/test/resources/sample-app/custom-forests/forests/sample-app-content/custom-forests.json

@@ -2,13 +2,11 @@
 	{
 		"forest-name": "sample-app-content-custom-1",
 		"enabled": true,
-		"host": "%%CUSTOM_HOST%%",
 		"database": "%%DATABASE%%"
 	},
 	{
 		"forest-name": "sample-app-content-custom-2",
 		"enabled": true,
-		"host": "%%CUSTOM_HOST%%",
 		"database": "%%DATABASE%%"
 	}
 ]

src/test/resources/sample-app/custom-forests/forests/sample-app-content/single-custom-forest.json

@@ -1,6 +1,5 @@
 {
 	"forest-name": "sample-app-content-custom-3",
 	"enabled": true,
-	"host": "%%CUSTOM_HOST%%",
 	"database": "%%DATABASE%%"
 }