ACS-3864: Fix failing build

This commit is contained in:
KikoUK
2022-10-28 13:39:01 +01:00
parent fff2343a6e
commit 7642c8ef8a

View File

@@ -45,18 +45,18 @@ import org.testng.annotations.Test;
public class SearchSolrAPITest extends AbstractE2EFunctionalTest public class SearchSolrAPITest extends AbstractE2EFunctionalTest
{ {
@Test(priority = 1) @Test(priority = 1)
public void testGetSolrConfig() throws Exception public void testGetSolrConfig()
{ {
RestTextResponse response = restClient.authenticateUser(adminUserModel).withSolrAPI().getConfig(); RestTextResponse response = restClient.authenticateUser(adminUserModel).withSolrAPI().getConfig();
restClient.assertStatusCodeIs(HttpStatus.OK); restClient.assertStatusCodeIs(HttpStatus.OK);
restClient.onResponse().assertThat().content(Matchers.containsString("config")); restClient.onResponse().assertThat().body(Matchers.containsString("config"));
Assert.assertNotNull(response.getJsonValueByPath("config.requestHandler")); Assert.assertNotNull(response.getJsonValueByPath("config.requestHandler"));
Assert.assertNotNull(response.getJsonObjectByPath("config.requestHandler")); Assert.assertNotNull(response.getJsonObjectByPath("config.requestHandler"));
// TODO: Following asserts fail with error: // TODO: Following asserts fail with error:
/* /*
* java.lang.IllegalStateException: Expected response body to be verified as JSON, HTML or XML but content-type 'text/plain' is not supported out of the box. * java.lang.IllegalStateException: Expected response body to be verified as JSON, HTML or XML but body-type 'text/plain' is not supported out of the box.
* Try registering a custom parser using: RestAssured.registerParser("text/plain", <parser type>); * Try registering a custom parser using: RestAssured.registerParser("text/plain", <parser type>);
*/ */
@@ -65,7 +65,7 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest
} }
@Test(priority = 2) @Test(priority = 2)
public void testEditSolrConfig() throws Exception public void testEditSolrConfig()
{ {
String expectedError = "solrconfig editing is not enabled due to disable.configEdit"; String expectedError = "solrconfig editing is not enabled due to disable.configEdit";
@@ -85,11 +85,11 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest
restClient.authenticateUser(adminUserModel).withSolrAPI().postConfig(postBody); restClient.authenticateUser(adminUserModel).withSolrAPI().postConfig(postBody);
restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN); restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN);
restClient.onResponse().assertThat().content(Matchers.containsString(expectedError)); restClient.onResponse().assertThat().body(Matchers.containsString(expectedError));
// TODO: Following asserts fail with error: // TODO: Following asserts fail with error:
/* /*
* java.lang.IllegalStateException: Expected response body to be verified as JSON, HTML or XML but content-type 'text/plain' is not supported out of the box. * java.lang.IllegalStateException: Expected response body to be verified as JSON, HTML or XML but body-type 'text/plain' is not supported out of the box.
* Try registering a custom parser using: RestAssured.registerParser("text/plain", <parser type>); * Try registering a custom parser using: RestAssured.registerParser("text/plain", <parser type>);
*/ */
@@ -97,21 +97,21 @@ public class SearchSolrAPITest extends AbstractE2EFunctionalTest
} }
@Test(priority = 3) @Test(priority = 3)
public void testGetSolrConfigOverlay() throws Exception public void testGetSolrConfigOverlay()
{ {
restClient.authenticateUser(adminUserModel).withSolrAPI().getConfigOverlay(); restClient.authenticateUser(adminUserModel).withSolrAPI().getConfigOverlay();
restClient.assertStatusCodeIs(HttpStatus.OK); restClient.assertStatusCodeIs(HttpStatus.OK);
restClient.onResponse().assertThat().content(Matchers.containsString("overlay")); restClient.onResponse().assertThat().body(Matchers.containsString("overlay"));
} }
@Test(priority = 4) @Test(priority = 4)
public void testGetSolrConfigParams() throws Exception public void testGetSolrConfigParams()
{ {
restClient.authenticateUser(adminUserModel).withSolrAPI().getConfigParams(); restClient.authenticateUser(adminUserModel).withSolrAPI().getConfigParams();
restClient.assertStatusCodeIs(HttpStatus.OK); restClient.assertStatusCodeIs(HttpStatus.OK);
restClient.onResponse().assertThat().content(Matchers.containsString("response")); restClient.onResponse().assertThat().body(Matchers.containsString("response"));
} }
@Test(priority = 5) @Test(priority = 5)