Incremental deploy now works across commands

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/ResourceFileManagerImpl.java

@@ -36,6 +36,9 @@ public ResourceFileManagerImpl(String propertiesFilePath) {
 	 */
 	@Override
 	public boolean shouldResourceFileBeProcessed(File file) {
+		// Need to initialize this on every check because the properties file may have been updated by
+		// some other command
+		this.initialize();
 		boolean shouldBeProcessed = hasFileBeenModifiedSinceLastLoaded(file);
 		if (shouldBeProcessed) {
 			if (logger.isDebugEnabled()) {

src/main/java/com/marklogic/appdeployer/command/ResourceFilenameFilter.java

@@ -119,8 +119,8 @@ protected boolean filenameHasSupportedExtension(String filename) {
 	protected boolean acceptFileBasedOnIncrementalCheck(File dir, String filename) {
 		File resourceFile = new File(dir, filename);
 		if (filesToIgnoreIncrementalCheck.contains(resourceFile)) {
-			if (logger.isInfoEnabled()) {
-				logger.info("Ignoring incremental check for file: " + resourceFile.getAbsolutePath());
+			if (logger.isDebugEnabled()) {
+				logger.debug("Ignoring incremental check for file: " + resourceFile.getAbsolutePath());
 			}
 			return true;
 		} else {

src/test/java/com/marklogic/appdeployer/command/AbstractIncrementalDeployTest.java

@@ -0,0 +1,21 @@
+package com.marklogic.appdeployer.command;
+
+import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.mgmt.ManageClient;
+import org.junit.Before;
+
+public abstract class AbstractIncrementalDeployTest extends AbstractAppDeployerTest {
+
+	protected ManageClient originalManageClient;
+
+	@Before
+	public void setupIncrementalDeployTest() {
+		appConfig.setIncrementalDeploy(true);
+		this.originalManageClient = this.manageClient;
+		deleteResourceTimestampsFile();
+	}
+	
+	public void deleteResourceTimestampsFile() {
+		new ResourceFileManagerImpl().deletePropertiesFile();
+	}
+}

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

@@ -1,35 +1,25 @@
 package com.marklogic.appdeployer.command.security;
 
-import com.marklogic.appdeployer.AbstractAppDeployerTest;
-import com.marklogic.appdeployer.command.ResourceFileManagerImpl;
-import com.marklogic.appdeployer.command.ResourceFilenameFilter;
-import com.marklogic.mgmt.ManageClient;
+import com.marklogic.appdeployer.command.AbstractIncrementalDeployTest;
 import com.marklogic.mgmt.resource.security.RoleManager;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
 
-public class IncrementallyDeployRolesTest extends AbstractAppDeployerTest {
+public class IncrementallyDeployRolesTest extends AbstractIncrementalDeployTest {
 
 	private final static String ROLE_INSTALL = "sampleapp-install";
 	private final static String ROLE_MODULES = "sampleapp-modules";
 
 	private RoleManager roleManager;
-	private DeployRolesCommand deployRolesCommand;
-	private ManageClient originalManageClient;
 
 	@Before
 	public void setup() {
-		appConfig.setIncrementalDeploy(true);
 		appConfig.getFirstConfigDir().setBaseDir(new File("src/test/resources/sample-app/roles-with-permissions"));
-
 		roleManager = new RoleManager(manageClient);
 		assertRolesDontExist();
-
-		originalManageClient = this.manageClient;
-		deployRolesCommand = new DeployRolesCommand();
 	}
 
 	@After
@@ -42,7 +32,7 @@ public void teardown() {
 
 	@Test
 	public void filesShouldNotBeDeployedDuringSecondDeployment() {
-		initializeAppDeployer(deployRolesCommand);
+		initializeAppDeployer(new DeployRolesCommand());
 		deleteResourceTimestampsFile();
 		deploySampleApp();
 		assertRolesExist();
@@ -57,7 +47,7 @@ public void filesShouldNotBeDeployedDuringSecondDeployment() {
 
 	@Test
 	public void filesShouldBeDeployedDuringSecondDeployment() {
-		initializeAppDeployer(deployRolesCommand);
+		initializeAppDeployer(new DeployRolesCommand());
 		deleteResourceTimestampsFile();
 		deploySampleApp();
 		assertRolesExist();
@@ -75,15 +65,6 @@ public void filesShouldBeDeployedDuringSecondDeployment() {
 		}
 	}
 
-	/**
-	 * The properties file may exist from a previous run of the test, so this is used to delete it.
-	 */
-	private void deleteResourceTimestampsFile() {
-		ResourceFilenameFilter filter = (ResourceFilenameFilter) deployRolesCommand.getResourceFilenameFilter();
-		ResourceFileManagerImpl manager = (ResourceFileManagerImpl) filter.getResourceFileManager();
-		manager.deletePropertiesFile();
-	}
-
 	private void assertRolesExist() {
 		assertTrue(roleManager.exists(ROLE_INSTALL));
 		assertTrue(roleManager.exists(ROLE_MODULES));

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

@@ -1,46 +1,96 @@
 package com.marklogic.appdeployer.command.security;
 
-import com.marklogic.appdeployer.AbstractAppDeployerTest;
-import com.marklogic.mgmt.ManageClient;
+import com.marklogic.appdeployer.command.AbstractIncrementalDeployTest;
+import com.marklogic.appdeployer.command.ResourceFileManagerImpl;
+import com.marklogic.mgmt.resource.security.RoleManager;
 import com.marklogic.mgmt.resource.security.UserManager;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
-public class IncrementallyDeployUsersTest extends AbstractAppDeployerTest {
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Properties;
 
-	private ManageClient originalManageClient;
+public class IncrementallyDeployUsersTest extends AbstractIncrementalDeployTest {
+
+	private UserManager userManager;
+	private RoleManager roleManager;
+
+	@Before
+	public void setup() {
+		userManager = new UserManager(manageClient);
+		roleManager = new RoleManager(manageClient);
+	}
 
 	@After
 	public void teardown() {
 		this.manageClient = originalManageClient;
+		initializeAppDeployer(new DeployUsersCommand(), new DeployRolesCommand());
 		undeploySampleApp();
-		assertUsersDontExist(new UserManager(manageClient));
+		assertUsersDontExist();
+		assertRolesDontExist();
 	}
 
 	@Test
 	public void test() {
 		this.originalManageClient = this.manageClient;
-		UserManager userManager = new UserManager(manageClient);
-		assertUsersDontExist(userManager);
+		assertUsersDontExist();
 
 		initializeAppDeployer(new DeployUsersCommand());
 		deploySampleApp();
-		assertUsersExist(userManager);
+		assertUsersExist();
 
 		// Ensure that no calls can be made to the Manage API. The deployment should succeed because neither of
 		// the role files have been modified.
 		this.manageClient = null;
+		initializeAppDeployer(new DeployUsersCommand());
 		deploySampleApp();
-		assertUsersExist(userManager);
+		assertUsersExist();
 	}
 
-	private void assertUsersExist(UserManager userManager) {
+	@Test
+	public void usersAndRoles() throws IOException  {
+		this.originalManageClient = this.manageClient;
+
+		assertUsersDontExist();
+		assertRolesDontExist();
+
+		initializeAppDeployer(new DeployUsersCommand(), new DeployRolesCommand());
+		deploySampleApp();
+		assertUsersExist();
+		assertRolesExist();
+
+		this.manageClient = null;
+		initializeAppDeployer(new DeployUsersCommand(), new DeployRolesCommand());
+		deploySampleApp();
+		assertUsersExist();
+		assertRolesExist();
+
+		Properties props = new Properties();
+		FileReader reader = new FileReader(ResourceFileManagerImpl.DEFAULT_FILE_PATH);
+		props.load(reader);
+		reader.close();
+		assertEquals("There should be 2 entries for users and 2 entries for roles", 4, props.size());
+	}
+
+	private void assertUsersExist() {
 		assertTrue(userManager.exists("sample-app-jane"));
 		assertTrue(userManager.exists("sample-app-john"));
 	}
 
-	private void assertUsersDontExist(UserManager userManager) {
+	private void assertUsersDontExist() {
 		assertFalse(userManager.exists("sample-app-jane"));
 		assertFalse(userManager.exists("sample-app-john"));
 	}
+
+	private void assertRolesExist() {
+		assertTrue(roleManager.exists("sample-app-role1"));
+		assertTrue(roleManager.exists("sample-app-role2"));
+	}
+
+	private void assertRolesDontExist() {
+		assertFalse(roleManager.exists("sample-app-role1"));
+		assertFalse(roleManager.exists("sample-app-role2"));
+	}
 }