vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix more test.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2024-01-22 23:11:20 -08:00
parent 861b4f22fd
commit 56e4970861
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/resources/application.properties
View File

@ -12,7 +12,7 @@ spring.sql.init.mode=always
spring.sql.init.platform=hsqldb spring.sql.init.platform=hsqldb
# LOG # LOG
logging.level.root=TRACE logging.level.root=INFO
logging.level.org.apache.tomcat=INFO logging.level.org.apache.tomcat=INFO
################################################################################## ##################################################################################

60
wise-webapp/src/test/java/com/wisemapping/test/rest/RestMindmapControllerTest.java
View File

@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.*; import org.springframework.http.*;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.util.DefaultUriBuilderFactory; import org.springframework.web.util.DefaultUriBuilderFactory;
@ -390,38 +391,35 @@ public class RestMindmapControllerTest {
return newCollab; return newCollab;
} }
//
// @Test(dataProviderClass = RestHelper.class, dataProvider = "ContentType-Provider-Function") @Test
// public void deleteCollabsWithInvalidEmail(final @NotNull MediaType mediaType) { public void deleteCollabsWithInvalidEmail() {
// final HttpHeaders requestHeaders = createHeaders(mediaType); final HttpHeaders requestHeaders = createHeaders(MediaType.APPLICATION_JSON);
// final RestTemplate template = createTemplate(userEmail); final TestRestTemplate restTemplate = this.restTemplate.withBasicAuth(user.getEmail(), user.getPassword());
// Create a sample map ...
final URI resourceUri = addNewMap(restTemplate, "deleteCollabsWithInvalidEmail");
// Remove with invalid email ...
try {
restTemplate.delete(resourceUri + "/collabs?email=invalidEmail");
} catch (HttpClientErrorException e) {
assertEquals(e.getRawStatusCode(), 400);
assertTrue(e.getMessage().contains("Invalid email exception:"));
}
// Check that it has been removed ...
final ResponseEntity<RestCollaborationList> afterDeleteResponse = fetchCollabs(requestHeaders, restTemplate, resourceUri);
assertEquals(Objects.requireNonNull(afterDeleteResponse.getBody()).getCollaborations().size(), 1);
}
// @Test
// public void deleteCollabsWithoutOwnerPermission() {
// final HttpHeaders requestHeaders = createHeaders(MediaType.APPLICATION_JSON);
// final TestRestTemplate restTemplate = this.restTemplate.withBasicAuth(user.getEmail(), user.getPassword());
// //
// // Create a sample map ... // // Create a sample map ...
// final URI resourceUri = addNewMap(template, "deleteCollabsWithInvalidEmail"); // final URI resourceUri = addNewMap(restTemplate, "deleteWithoutOwnerPermission");
//
// // Remove with invalid email ...
// try {
//
// template.delete(HOST_PORT + resourceUri + "/collabs?email=invalidEmail");
// } catch (HttpClientErrorException e) {
// assertEquals(e.getRawStatusCode(), 400);
// assertTrue(e.getMessage().contains("Invalid email exception:"));
// }
//
// // Check that it has been removed ...
// final ResponseEntity<RestCollaborationList> afterDeleteResponse = fetchCollabs(requestHeaders, template, resourceUri);
// assertEquals(afterDeleteResponse.getBody().getCollaborations().size(), 1);
// }
//
// @Test(dataProviderClass = RestHelper.class, dataProvider = "ContentType-Provider-Function")
// public void deleteCollabsWithoutOwnerPermission(final @NotNull MediaType mediaType) {
//
//
// final HttpHeaders requestHeaders = createHeaders(mediaType);
// RestTemplate template = createTemplate(userEmail);
//
// // Create a sample map ...
// final URI resourceUri = addNewMap(template, "deleteWithoutOwnerPermission");
// //
// final String newCollab = restAdminITCase.createNewUser(MediaType.APPLICATION_JSON); // final String newCollab = restAdminITCase.createNewUser(MediaType.APPLICATION_JSON);
// template = createTemplate(newCollab + ":admin"); // template = createTemplate(newCollab + ":admin");
@ -453,7 +451,7 @@ public class RestMindmapControllerTest {
// assertTrue(e.getMessage().contains("Can not remove owner collab")); // assertTrue(e.getMessage().contains("Can not remove owner collab"));
// } // }
// } // }
//
@NotNull @NotNull
private ResponseEntity<RestCollaborationList> fetchCollabs(HttpHeaders requestHeaders, TestRestTemplate template, URI resourceUri) { private ResponseEntity<RestCollaborationList> fetchCollabs(HttpHeaders requestHeaders, TestRestTemplate template, URI resourceUri) {
final HttpEntity<RestCollaborationList> findCollabs = new HttpEntity(requestHeaders); final HttpEntity<RestCollaborationList> findCollabs = new HttpEntity(requestHeaders);