From a9d127cc8226de98ab973b358d34842b6d27bacf Mon Sep 17 00:00:00 2001
From: "michael.breu" <michael.breu@uibk.ac.at>
Date: Thu, 15 Apr 2021 17:53:26 +0200
Subject: [PATCH] Fixing Tests
---
.../gitsearch/web/rest/SavedSearchesResourceIT.java | 11 ++++++++++-
.../gitsearch/web/rest/UserWatchListResourceIT.java | 10 +++++++++-
.../gitsearch/web/rest/WatchListEntryResourceIT.java | 10 +++++++++-
3 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java
index 22178781b..bd4d3c2c6 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/SavedSearchesResourceIT.java
@@ -5,6 +5,7 @@ import at.ac.uibk.gitsearch.domain.SavedSearches;
import at.ac.uibk.gitsearch.domain.User;
import at.ac.uibk.gitsearch.repository.SavedSearchesRepository;
import at.ac.uibk.gitsearch.repository.search.SavedSearchesSearchRepository;
+import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import at.ac.uibk.gitsearch.service.SavedSearchesService;
import at.ac.uibk.gitsearch.service.dto.SavedSearchesDTO;
import at.ac.uibk.gitsearch.service.mapper.SavedSearchesMapper;
@@ -31,6 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
import static org.hamcrest.Matchers.hasItem;
import static org.mockito.Mockito.*;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -40,7 +42,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@SpringBootTest(classes = GitsearchApp.class)
@ExtendWith(MockitoExtension.class)
@AutoConfigureMockMvc
-@WithMockUser
+@WithMockUser(authorities = AuthoritiesConstants.ADMIN)
public class SavedSearchesResourceIT {
private static final String DEFAULT_NAME = "AAAAAAAAAA";
@@ -121,6 +123,7 @@ public class SavedSearchesResourceIT {
// Create the SavedSearches
SavedSearchesDTO savedSearchesDTO = savedSearchesMapper.toDto(savedSearches);
restSavedSearchesMockMvc.perform(post("/api/saved-searches")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(savedSearchesDTO)))
.andExpect(status().isCreated());
@@ -147,6 +150,7 @@ public class SavedSearchesResourceIT {
// An entity with an existing ID cannot be created, so this API call must fail
restSavedSearchesMockMvc.perform(post("/api/saved-searches")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(savedSearchesDTO)))
.andExpect(status().isBadRequest());
@@ -172,6 +176,7 @@ public class SavedSearchesResourceIT {
restSavedSearchesMockMvc.perform(post("/api/saved-searches")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(savedSearchesDTO)))
.andExpect(status().isBadRequest());
@@ -192,6 +197,7 @@ public class SavedSearchesResourceIT {
restSavedSearchesMockMvc.perform(post("/api/saved-searches")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(savedSearchesDTO)))
.andExpect(status().isBadRequest());
@@ -255,6 +261,7 @@ public class SavedSearchesResourceIT {
SavedSearchesDTO savedSearchesDTO = savedSearchesMapper.toDto(updatedSavedSearches);
restSavedSearchesMockMvc.perform(put("/api/saved-searches")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(savedSearchesDTO)))
.andExpect(status().isOk());
@@ -280,6 +287,7 @@ public class SavedSearchesResourceIT {
// If the entity doesn't have an ID, it will throw BadRequestAlertException
restSavedSearchesMockMvc.perform(put("/api/saved-searches")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(savedSearchesDTO)))
.andExpect(status().isBadRequest());
@@ -302,6 +310,7 @@ public class SavedSearchesResourceIT {
// Delete the savedSearches
restSavedSearchesMockMvc.perform(delete("/api/saved-searches/{id}", savedSearches.getId())
+ .with(csrf().asHeader())
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isNoContent());
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java
index 988296eff..e5950db74 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java
@@ -6,6 +6,7 @@ import static org.hamcrest.Matchers.hasItem;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -38,6 +39,7 @@ import at.ac.uibk.gitsearch.domain.User;
import at.ac.uibk.gitsearch.domain.UserWatchList;
import at.ac.uibk.gitsearch.repository.UserWatchListRepository;
import at.ac.uibk.gitsearch.repository.search.UserWatchListSearchRepository;
+import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import at.ac.uibk.gitsearch.service.UserWatchListQueryService;
import at.ac.uibk.gitsearch.service.UserWatchListService;
import at.ac.uibk.gitsearch.service.dto.UserWatchListDTO;
@@ -49,7 +51,7 @@ import at.ac.uibk.gitsearch.service.mapper.UserWatchListMapper;
@SpringBootTest(classes = GitsearchApp.class)
@ExtendWith(MockitoExtension.class)
@AutoConfigureMockMvc
-@WithMockUser
+@WithMockUser(authorities = AuthoritiesConstants.ADMIN)
public class UserWatchListResourceIT {
private static final String DEFAULT_NAME = "AAAAAAAAAA";
@@ -128,6 +130,7 @@ public class UserWatchListResourceIT {
// Create the UserWatchList
UserWatchListDTO userWatchListDTO = userWatchListMapper.toDto(userWatchList);
restUserWatchListMockMvc.perform(post("/api/user-watch-lists")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userWatchListDTO)))
.andExpect(status().isCreated());
@@ -153,6 +156,7 @@ public class UserWatchListResourceIT {
// An entity with an existing ID cannot be created, so this API call must fail
restUserWatchListMockMvc.perform(post("/api/user-watch-lists")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userWatchListDTO)))
.andExpect(status().isBadRequest());
@@ -178,6 +182,7 @@ public class UserWatchListResourceIT {
restUserWatchListMockMvc.perform(post("/api/user-watch-lists")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userWatchListDTO)))
.andExpect(status().isBadRequest());
@@ -386,6 +391,7 @@ public class UserWatchListResourceIT {
UserWatchListDTO userWatchListDTO = userWatchListMapper.toDto(updatedUserWatchList);
restUserWatchListMockMvc.perform(put("/api/user-watch-lists")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userWatchListDTO)))
.andExpect(status().isOk());
@@ -410,6 +416,7 @@ public class UserWatchListResourceIT {
// If the entity doesn't have an ID, it will throw BadRequestAlertException
restUserWatchListMockMvc.perform(put("/api/user-watch-lists")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userWatchListDTO)))
.andExpect(status().isBadRequest());
@@ -432,6 +439,7 @@ public class UserWatchListResourceIT {
// Delete the userWatchList
restUserWatchListMockMvc.perform(delete("/api/user-watch-lists/{id}", userWatchList.getId())
+ .with(csrf().asHeader())
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isNoContent());
diff --git a/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java b/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java
index 2da093ace..1c242d85a 100644
--- a/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/web/rest/WatchListEntryResourceIT.java
@@ -4,6 +4,7 @@ import at.ac.uibk.gitsearch.GitsearchApp;
import at.ac.uibk.gitsearch.domain.WatchListEntry;
import at.ac.uibk.gitsearch.repository.WatchListEntryRepository;
import at.ac.uibk.gitsearch.repository.search.WatchListEntrySearchRepository;
+import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import at.ac.uibk.gitsearch.service.WatchListEntryService;
import at.ac.uibk.gitsearch.service.dto.WatchListEntryDTO;
import at.ac.uibk.gitsearch.service.mapper.WatchListEntryMapper;
@@ -30,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
import static org.hamcrest.Matchers.hasItem;
import static org.mockito.Mockito.*;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -39,7 +41,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@SpringBootTest(classes = GitsearchApp.class)
@ExtendWith(MockitoExtension.class)
@AutoConfigureMockMvc
-@WithMockUser
+@WithMockUser(authorities = AuthoritiesConstants.ADMIN)
public class WatchListEntryResourceIT {
private static final String DEFAULT_EXERCISE_ID = "AAAAAAAAAA";
@@ -110,6 +112,7 @@ public class WatchListEntryResourceIT {
// Create the WatchListEntry
WatchListEntryDTO watchListEntryDTO = watchListEntryMapper.toDto(watchListEntry);
restWatchListEntryMockMvc.perform(post("/api/watch-list-entries")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(watchListEntryDTO)))
.andExpect(status().isCreated());
@@ -136,6 +139,7 @@ public class WatchListEntryResourceIT {
// An entity with an existing ID cannot be created, so this API call must fail
restWatchListEntryMockMvc.perform(post("/api/watch-list-entries")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(watchListEntryDTO)))
.andExpect(status().isBadRequest());
@@ -161,6 +165,7 @@ public class WatchListEntryResourceIT {
restWatchListEntryMockMvc.perform(post("/api/watch-list-entries")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(watchListEntryDTO)))
.andExpect(status().isBadRequest());
@@ -224,6 +229,7 @@ public class WatchListEntryResourceIT {
WatchListEntryDTO watchListEntryDTO = watchListEntryMapper.toDto(updatedWatchListEntry);
restWatchListEntryMockMvc.perform(put("/api/watch-list-entries")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(watchListEntryDTO)))
.andExpect(status().isOk());
@@ -249,6 +255,7 @@ public class WatchListEntryResourceIT {
// If the entity doesn't have an ID, it will throw BadRequestAlertException
restWatchListEntryMockMvc.perform(put("/api/watch-list-entries")
+ .with(csrf().asHeader())
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(watchListEntryDTO)))
.andExpect(status().isBadRequest());
@@ -271,6 +278,7 @@ public class WatchListEntryResourceIT {
// Delete the watchListEntry
restWatchListEntryMockMvc.perform(delete("/api/watch-list-entries/{id}", watchListEntry.getId())
+ .with(csrf().asHeader())
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isNoContent());
--
GitLab