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

Fix more tests.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2024-02-03 12:26:18 -08:00
parent 1059643b0f
commit 1db881e3e2
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import com.wisemapping.rest.model.*;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
@ -284,7 +285,7 @@ public class RestMindmapControllerTest {
// Check that the map has been updated ... // Check that the map has been updated ...
HttpEntity<RestUser> findMapEntity = new HttpEntity<>(requestHeaders); HttpEntity<RestUser> findMapEntity = new HttpEntity<>(requestHeaders);
final ResponseEntity<RestMindmap> response = restTemplate.exchange(resourceUri, HttpMethod.GET, findMapEntity, RestMindmap.class); final ResponseEntity<RestMindmap> response = restTemplate.exchange(resourceUri, HttpMethod.GET, findMapEntity, RestMindmap.class);
assertEquals(response.getBody().getXml(), mapToUpdate.getXml()); assertEquals(Objects.requireNonNull(response.getBody()).getXml(), mapToUpdate.getXml());
assertEquals(response.getBody().getProperties(), mapToUpdate.getProperties()); assertEquals(response.getBody().getProperties(), mapToUpdate.getProperties());
// Unlock ... // Unlock ...
@ -345,7 +346,7 @@ public class RestMindmapControllerTest {
// Has been added ? // Has been added ?
final ResponseEntity<RestCollaborationList> afterResponse = fetchCollabs(requestHeaders, restTemplate, resourceUri); final ResponseEntity<RestCollaborationList> afterResponse = fetchCollabs(requestHeaders, restTemplate, resourceUri);
final Optional<RestCollaboration> updatedCollab = afterResponse.getBody().getCollaborations().stream().filter(c -> c.getEmail().equals(newCollab)).findAny(); final Optional<RestCollaboration> updatedCollab = Objects.requireNonNull(afterResponse.getBody()).getCollaborations().stream().filter(c -> c.getEmail().equals(newCollab)).findAny();
assertTrue(updatedCollab.isPresent()); assertTrue(updatedCollab.isPresent());
assertEquals(updatedCollab.get().getRole(), "viewer"); assertEquals(updatedCollab.get().getRole(), "viewer");
} }
@ -372,7 +373,7 @@ public class RestMindmapControllerTest {
// Check that it has been removed ... // Check that it has been removed ...
final ResponseEntity<RestCollaborationList> afterDeleteResponse = fetchCollabs(requestHeaders, restTemplate, resourceUri); final ResponseEntity<RestCollaborationList> afterDeleteResponse = fetchCollabs(requestHeaders, restTemplate, resourceUri);
assertEquals(afterDeleteResponse.getBody().getCollaborations().size(), 1); assertEquals(Objects.requireNonNull(afterDeleteResponse.getBody()).getCollaborations().size(), 1);
} }
private String addNewCollaboration(final HttpHeaders requestHeaders, final TestRestTemplate template, final URI resourceUri) throws RestClientException { private String addNewCollaboration(final HttpHeaders requestHeaders, final TestRestTemplate template, final URI resourceUri) throws RestClientException {
@ -402,13 +403,12 @@ public class RestMindmapControllerTest {
assertTrue(exchange.getStatusCode().is4xxClientError()); assertTrue(exchange.getStatusCode().is4xxClientError());
assertTrue(Objects.requireNonNull(exchange.getBody()).contains("Invalid email exception:")); assertTrue(Objects.requireNonNull(exchange.getBody()).contains("Invalid email exception:"));
// Check that it has been removed ... // Check that it has been removed ...
final ResponseEntity<RestCollaborationList> afterDeleteResponse = fetchCollabs(requestHeaders, restTemplate, resourceUri); final ResponseEntity<RestCollaborationList> afterDeleteResponse = fetchCollabs(requestHeaders, restTemplate, resourceUri);
assertEquals(Objects.requireNonNull(afterDeleteResponse.getBody()).getCollaborations().size(), 1); assertEquals(Objects.requireNonNull(afterDeleteResponse.getBody()).getCollaborations().size(), 1);
} }
// @Test // @Test
// public void deleteCollabsWithoutOwnerPermission() { // public void deleteCollabsWithoutOwnerPermission() {
// final HttpHeaders requestHeaders = createHeaders(MediaType.APPLICATION_JSON); // final HttpHeaders requestHeaders = createHeaders(MediaType.APPLICATION_JSON);
// final TestRestTemplate restTemplate = this.restTemplate.withBasicAuth(user.getEmail(), user.getPassword()); // final TestRestTemplate restTemplate = this.restTemplate.withBasicAuth(user.getEmail(), user.getPassword());
@ -430,22 +430,18 @@ public class RestMindmapControllerTest {
// //
// } // }
// //
// @Test(dataProviderClass = RestHelper.class, dataProvider = "ContentType-Provider-Function") @Test
// public void deleteOwnerCollab(final @NotNull MediaType mediaType) { public void deleteOwnerCollab() {
// final HttpHeaders requestHeaders = createHeaders(mediaType); final TestRestTemplate restTemplate = this.restTemplate.withBasicAuth(user.getEmail(), user.getPassword());
// final RestTemplate template = createTemplate(userEmail);
// // Create a sample map ...
// // Create a sample map ... final URI resourceUri = addNewMap(restTemplate, "Map for deleteOwnerCollab");
// final URI resourceUri = addNewMap(template, "Map for deleteOwnerCollab");
// // Now, remove owner collab ...
// // Now, remove owner collab ... final ResponseEntity<String> exchange = restTemplate.exchange(resourceUri + "/collabs?email=" + user.getEmail().replace(":admin", ""), HttpMethod.DELETE, null, String.class);
// try { assertTrue(exchange.getStatusCode().is4xxClientError());
// template.delete(HOST_PORT + resourceUri + "/collabs?email=" + userEmail.replace(":admin", "")); assertTrue(Objects.requireNonNull(exchange.getBody()).contains("Can not remove owner collab"));
// } catch (HttpClientErrorException e) { }
// assertEquals(e.getRawStatusCode(), 400);
// 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) {
@ -475,7 +471,7 @@ public class RestMindmapControllerTest {
} }
@Test @Test
public void removeLabelFromMindmap() throws IOException, WiseMappingException { // Configure media types ... public void removeLabelFromMindmap() { // Configure media types ...
final HttpHeaders requestHeaders = createHeaders(MediaType.APPLICATION_JSON); final HttpHeaders requestHeaders = createHeaders(MediaType.APPLICATION_JSON);
final TestRestTemplate restTemplate = this.restTemplate.withBasicAuth(user.getEmail(), user.getPassword()); final TestRestTemplate restTemplate = this.restTemplate.withBasicAuth(user.getEmail(), user.getPassword());
@ -511,14 +507,14 @@ public class RestMindmapControllerTest {
.findAny(); .findAny();
} }
//
// @Test(dataProviderClass = RestHelper.class, dataProvider = "ContentType-Provider-Function")
// public void deleteMapAndCheckLabels(final @NotNull MediaType mediaType) { // Configure media types ...
// throw new SkipException("missing test: delete map should not affects others labels");
// }
//
@Test @Test
public void addLabelToMindmap() throws IOException, WiseMappingException { // Configure media types ... @Disabled("missing test: delete map should not affects others labels")
public void deleteMapAndCheckLabels(final @NotNull MediaType mediaType) { // Configure media types ...
}
@Test
public void addLabelToMindmap() { // Configure media types ...
final HttpHeaders requestHeaders = createHeaders(MediaType.APPLICATION_JSON); final HttpHeaders requestHeaders = createHeaders(MediaType.APPLICATION_JSON);
final TestRestTemplate restTemplate = this.restTemplate.withBasicAuth(user.getEmail(), user.getPassword()); final TestRestTemplate restTemplate = this.restTemplate.withBasicAuth(user.getEmail(), user.getPassword());
@ -542,8 +538,8 @@ public class RestMindmapControllerTest {
assertTrue(mindmapInfo.get().getLabels().size() == 1); assertTrue(mindmapInfo.get().getLabels().size() == 1);
} }
//
// @Test(dataProviderClass = RestHelper.class, dataProvider = "ContentType-Provider-Function") // @Test(dataProviderClass = RestHelper.class, dataProvider = "ContentType-Provider-Function")
// public void updateCollabs(final @NotNull MediaType mediaType) { // public void updateCollabs(final @NotNull MediaType mediaType) {
// //
// // Create a sample map ... // // Create a sample map ...