Merge pull request #454 from marklogic-community/feature/test-fixes

Fixes for failing tests

Author: rjrudin

src/test/java/com/marklogic/appdeployer/AbstractAppDeployerTest.java

@@ -20,8 +20,8 @@ public abstract class AbstractAppDeployerTest extends AbstractMgmtTest {
 
     public final static String SAMPLE_APP_NAME = "sample-app";
 
-    protected final static Integer SAMPLE_APP_REST_PORT = 8540;
-    protected final static Integer SAMPLE_APP_TEST_REST_PORT = 8541;
+    protected final static Integer SAMPLE_APP_REST_PORT = 8004;
+    protected final static Integer SAMPLE_APP_TEST_REST_PORT = 8005;
 
     // Intended to be used by subclasses
     protected AppDeployer appDeployer;
@@ -38,13 +38,15 @@ protected void initializeAppConfig() {
 
     protected void initializeAppConfig(File projectDir) {
 	    appConfig = new AppConfig(projectDir);
-
+		appConfig.setHost(this.manageConfig.getHost());
 	    appConfig.setName(SAMPLE_APP_NAME);
 	    appConfig.setRestPort(SAMPLE_APP_REST_PORT);
 
 	    // Assume that the manager user can also be used as the REST admin user
 	    appConfig.setRestAdminUsername(manageConfig.getUsername());
 	    appConfig.setRestAdminPassword(manageConfig.getPassword());
+		appConfig.setAppServicesUsername(manageConfig.getUsername());
+		appConfig.setAppServicesPassword(manageConfig.getPassword());
     }
 
     /**

src/test/java/com/marklogic/appdeployer/command/modules/LoadInvalidRestModulesTest.java

@@ -32,8 +32,7 @@ public void test() {
 			deploySampleApp();
 			fail("The invalid search options file should have caused the LoadModulesCommand to fail");
 		} catch (RuntimeException re) {
-			logger.info("Caught expected error: " + re.getMessage());
-			assertTrue(re.getMessage().contains("Unexpected character"));
+			assertTrue(re.getMessage().contains("RESTAPI-INVALIDCONTENT"), "Unexpected message: " + re.getMessage());
 		} finally {
 			undeploySampleApp();
 		}

src/test/java/com/marklogic/appdeployer/command/modules/LoadModulesTest.java

@@ -88,15 +88,15 @@ public void customModuleTimestampsPath() {
 	public void loadModulesFromMultiplePaths() {
 		// Setting batch size just to verify that nothing blows up when doing so
 		appConfig.setModulesLoaderBatchSize(1);
-		appConfig.getModulePaths().add("src/test/resources/sample-app/build/mlRestApi/some-library/ml-modules");
+		appConfig.getModulePaths().add("src/test/resources/sample-app/other-modules");
 
 		initializeAppDeployer(new DeployRestApiServersCommand(true), buildLoadModulesCommand());
 		appDeployer.deploy(appConfig);
 
 		assertModuleExistsWithDefaultPermissions("sample-lib is loaded from /ext in the default path",
 			"/ext/sample-lib.xqy");
-		assertModuleExistsWithDefaultPermissions("some-lib.xqy is loaded from the path added at the start of the test",
-			"/ext/some-lib.xqy");
+		assertModuleExistsWithDefaultPermissions("other-lib.xqy is loaded from the path added at the start of the test",
+			"/other-lib.xqy");
 	}
 
 	@Test

src/test/java/com/marklogic/appdeployer/command/plugins/InstallPluginsTest.java

@@ -5,6 +5,7 @@
 import com.marklogic.appdeployer.command.databases.DeployOtherDatabasesCommand;
 import com.marklogic.appdeployer.command.restapis.DeployRestApiServersCommand;
 import com.marklogic.client.DatabaseClient;
+import com.marklogic.client.FailedRequestException;
 import com.marklogic.client.document.GenericDocumentManager;
 import com.marklogic.client.document.JSONDocumentManager;
 import com.marklogic.client.io.DocumentMetadataHandle;
@@ -37,7 +38,7 @@ public void test() {
 
 		deploySampleApp();
 
-		DatabaseClient contentClient = appConfig.newAppServicesDatabaseClient(appConfig.getContentDatabaseName());
+		DatabaseClient contentClient = appConfig.newDatabaseClient();
 		assertNotNull(contentClient.newDocumentManager().exists("/com.marklogic/plugins/varianceplugin.zip"),
 			"The plugin zip should have been written to the content database so that it can be installed");
 
@@ -60,7 +61,18 @@ public void test() {
 		object.put("amount", 30);
 		jsonDocumentManager.write("test3.json", new JacksonHandle(object));
 
-		assertTrue(invokePlugin(contentClient).startsWith("22.22"));
+		try {
+			String pluginResponse = invokePlugin(contentClient);
+			assertTrue(pluginResponse.startsWith("22.22"), "Unexpected plugin response: " + pluginResponse);
+		} catch (FailedRequestException ex) {
+			String message = ex.getMessage();
+			if (message.contains("invalid ELF header")) {
+				logger.warn("Could not verify that the plugin works as the platform that the plugin was built on does " +
+					"not match that of the platform running MarkLogic; error: " + message);
+			} else {
+				throw ex;
+			}
+		}
 
 		// Now uninstall the plugin and make sure the plugin can't be invoked
 		initializeAppDeployer(new InstallPluginsCommand());

src/test/java/com/marklogic/appdeployer/command/schemas/LoadSchemasTest.java

@@ -118,9 +118,13 @@ public void tdeValidationEnabled() {
 			deploySampleApp();
 			fail("The deploy should have failed because of a bad TDE template");
 		} catch (Exception ex) {
+			// With tde.templateBatchInsert being used starting with ML 10.0-9, we unfortunately do not get an error
+			// message that is helpful at all. JAVA-224 has been created to capture this.
 			String message = ex.getCause().getMessage();
-			assertTrue(message.startsWith("TDE template failed validation"));
-			assertTrue(message.contains("TDE-REPEATEDCOLUMN"));
+			assertTrue(message.contains("failed to apply resource at eval: Internal Server Error"), "Unexpected message: " + message);
+			// Previous assertions for < ML 10.0-9
+			// assertTrue(message.startsWith("TDE template failed validation"), "Unexpected message: " + message);
+			// assertTrue(message.contains("TDE-REPEATEDCOLUMN"), "Unexpected message: " + message);
 		}
 	}
 

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

@@ -113,8 +113,7 @@ public void twoAmpsWithDifferentModulesDatabase() {
 			"  \"role\": [\"rest-writer\"]\n" +
 			"}";
 
-		ManageClient client = new ManageClient();
-		AmpManager mgr = new AmpManager(client);
+		AmpManager mgr = new AmpManager(super.manageClient);
 
 		try {
 			// Create and verify

src/test/java/com/marklogic/appdeployer/export/ExportAmpsTest.java

@@ -38,8 +38,7 @@ public void test() throws Exception {
 			"  \"role\": [\"rest-writer\"]\n" +
 			"}";
 
-		ManageClient client = new ManageClient();
-		AmpManager mgr = new AmpManager(client);
+		AmpManager mgr = new AmpManager(super.manageClient);
 
 		try {
 			mgr.save(amp1);

src/test/resources/sample-app/bad-modules/options/invalid-options.xml

@@ -1,3 +1,3 @@
 <options xmlns="http://marklogic.com/appservices/search">
-	<TheseAre>invalid</TheseAre
+	<TheseAre>invalid</TheseAre>
 </options>