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

Test fixes

Author: rjrudin

.gitignore

@@ -14,3 +14,4 @@ target
 gradle-local.properties
 snyk
 .vscode
+src/test/resources/user.properties

src/test/java/com/marklogic/client/ext/AbstractIntegrationTest.java

@@ -54,7 +54,7 @@ protected DatabaseClient newClient(String database) {
 
 @Configuration
 @Import(value = {SpringDatabaseClientConfig.class})
-@PropertySource("classpath:application.properties")
+@PropertySource(value = { "classpath:test.properties", "classpath:user.properties" }, ignoreResourceNotFound = true)
 class TestConfig {
 
 	/**

src/test/java/com/marklogic/client/ext/modulesloader/impl/LoadModulesTest.java

@@ -133,7 +133,8 @@ public void invalidRestModule() {
 			modulesLoader.loadModules(dir, new DefaultModulesFinder(), client);
 			fail("Loading modules should have failed because of an invalid REST options file");
 		} catch (RuntimeException re) {
-			assertTrue(re.getMessage().contains("Unexpected character"));
+			assertTrue(re.getMessage().contains("RESTAPI-INVALIDCONTENT"),
+				"Unexpected message: " + re.getMessage());
 		}
 
 		// This should now succeed since DefaultModulesLoader won't rethrow the REST module failure

src/test/java/com/marklogic/client/ext/schemasloader/impl/ValidateTdeTemplatesTest.java

@@ -29,8 +29,11 @@ public void setup() {
 	public void badJsonFile() {
 		final String path = Paths.get("src", "test", "resources", "bad-schemas", "bad-json").toString();
 		if (TdeUtil.templateBatchInsertSupported(client)) {
-			FailedRequestException ex = assertThrows(FailedRequestException.class, () -> loader.loadSchemas(path));
-			logger.info(ex.getMessage());
+			RuntimeException ex = assertThrows(RuntimeException.class, () -> loader.loadSchemas(path));
+			FailedRequestException fre = (FailedRequestException)ex.getCause();
+			assertTrue(fre.getMessage().contains("failed to apply resource at eval: Internal Server Error"),
+				"Unfortunately, the FailedRequestException does not capture why the tde.templateBatchInsert failed; " +
+					"JAVA-224 has been opened to improve this; unexpected message: " + fre.getMessage());
 		} else {
 			try {
 				loader.loadSchemas(path);
@@ -59,8 +62,12 @@ public void goodTemplateThatsThenUpdatedViaJavascript() {
 	public void badXmlFile() {
 		final String path = Paths.get("src", "test", "resources", "bad-schemas", "bad-xml").toString();
 		if (TdeUtil.templateBatchInsertSupported(client)) {
-			FailedRequestException ex = assertThrows(FailedRequestException.class, () -> loader.loadSchemas(path));
-			logger.info(ex.getMessage());
+			RuntimeException ex = assertThrows(RuntimeException.class, () -> loader.loadSchemas(path));
+			FailedRequestException fre = (FailedRequestException)ex.getCause();
+			assertTrue(fre.getMessage().contains("failed to apply resource at eval: Internal Server Error"),
+				"Unfortunately, the FailedRequestException does not capture why the tde.templateBatchInsert failed; " +
+					"JAVA-224 has been opened to improve this; unexpected message: " + fre.getMessage());
+
 		} else {
 			try {
 				loader.loadSchemas(path);

src/test/resources/invalid-rest-modules/options/invalid-options.xml

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