Commit ffe02c5e authored by Noel Alonso's avatar Noel Alonso
Browse files

Arregla tests por cambio de rol

parent cd83c630

src/main/resources/application-test.properties

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ property.path.media_storage.LOCAL_PUBLIC_BASE_PATH=/tmp/PUBLIC_MEDIA_STORAGE 


test.user.ADMINISTRATOR=administrator@redmic.es

test.user.OPERATOR=operator@redmic.es

#TODO: eliminar cuando se cambie OAG por OPERATOR en librería test

test.user.OAG=operator@redmic.es

test.user.MANAGER=manager@redmic.es

test.user.COLLABORATOR=collaborator@redmic.es

test.user.USER=user@redmic.es

test.user.PASSWORD=test.user.PASSWORD

src/test/java/es/redmic/test/integration/common/IntegrationTestBase.java

+4 −4
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ public abstract class IntegrationTestBase { 
	@Value("${test.user.ADMINISTRATOR}")

	private String ADMINISTRATOR_USER;



	@Value("${test.user.OAG}")

	private String OAG_USER;

	@Value("${test.user.MANAGER}")

	private String MANAGER_USER;



	@Value("${test.user.COLLABORATOR}")

	private String COLLABORATOR_USER;
@@ -94,9 +94,9 @@ public abstract class IntegrationTestBase { 
		return obtainAccessToken(ADMINISTRATOR_USER, PASSWORD);

	}



	protected String getTokenOAGUser() {

	protected String getTokenManagerUser() {



		return obtainAccessToken(OAG_USER, PASSWORD);

		return obtainAccessToken(MANAGER_USER, PASSWORD);

	}



	protected String getTokenCollaboratorUser() {

src/test/java/es/redmic/test/integration/mediastorage/documents/DocumentMediaStorageControllerTest.java

+5 −5
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ public class DocumentMediaStorageControllerTest extends BaseMediaStorageControll 
	MockMultipartFile multipartFile = getFile(DOCUMENT_RESOURCES, FILENAME_DOCUMENT, DOCUMENT_CONTENT_TYPE);



	@Test

	public void checkSecurity_Return200_IfUploadDocumentAsOAGUser() throws Exception {

	public void checkSecurity_Return200_IfUploadDocumentAsManagerUser() throws Exception {



		MockHttpServletRequestBuilder fileUpload = multipart(BASE_MAPPING + CONTROLLER_UPLOAD_FILE).file(multipartFile)

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenOAGUser());

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenManagerUser());



		ResultActions result = mockMvc.perform(fileUpload);
@@ -71,7 +71,7 @@ public class DocumentMediaStorageControllerTest extends BaseMediaStorageControll 


		MockHttpServletRequestBuilder fileUpload = multipart(BASE_MAPPING + CONTROLLER_UPLOAD_FILE)

				.file(getFile(PHOTO_RESOURCES, FILENAME_PHOTO, PHOTO_CONTENT_TYPE))

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenOAGUser());

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenManagerUser());



		ResultActions result = mockMvc.perform(fileUpload);
@@ -103,7 +103,7 @@ public class DocumentMediaStorageControllerTest extends BaseMediaStorageControll 
	}



	@Test

	public void getFile_Return200_IfGetDocumentAsOAGUser() throws Exception {

	public void getFile_Return200_IfGetDocumentAsManagerUser() throws Exception {



		UrlDTO urlDTO = uploadMultipartFileToMediaStorage(DOCUMENT_RESOURCES, FILENAME_DOCUMENT, URL_DOCUMENTS,

				PATH_DOCUMENTS, DOCUMENT_CONTENT_TYPE);
@@ -112,7 +112,7 @@ public class DocumentMediaStorageControllerTest extends BaseMediaStorageControll 


		mediaStorage.checkFileExist(PATH_DOCUMENTS, newName);



		mockMvc.perform(get(urlDTO.getUrl().replace("/api", "")).header("Authorization", "Bearer " + getTokenOAGUser()))

		mockMvc.perform(get(urlDTO.getUrl().replace("/api", "")).header("Authorization", "Bearer " + getTokenManagerUser()))

				.andExpect(status().isOk());



		mediaStorage.deleteFile(PATH_DOCUMENTS, newName);

src/test/java/es/redmic/test/integration/mediastorage/ingestdata/CSVMediaStorageControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ public class CSVMediaStorageControllerTest extends BaseMediaStorageControllerTes 
	MockMultipartFile multipartFile = getFile(INGEST_DATA_RESOURCES, FILENAME_CSV, CSV_CONTENT_TYPE);



	@Test

	public void checkSecurity_Return200_IfUploadCSVDocumentAsOAGUser() throws Exception {

	public void checkSecurity_Return200_IfUploadCSVDocumentAsManagerUser() throws Exception {



		MockHttpServletRequestBuilder fileUpload = multipart(BASE_MAPPING + CONTROLLER_UPLOAD_FILE).file(multipartFile)

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenOAGUser());

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenManagerUser());



		ResultActions result = mockMvc.perform(fileUpload);
@@ -66,7 +66,7 @@ public class CSVMediaStorageControllerTest extends BaseMediaStorageControllerTes 


		MockHttpServletRequestBuilder fileUpload = multipart(BASE_MAPPING + CONTROLLER_UPLOAD_FILE)

				.file(getFile(PHOTO_RESOURCES, FILENAME_PHOTO, PHOTO_CONTENT_TYPE))

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenOAGUser());

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenManagerUser());



		ResultActions result = mockMvc.perform(fileUpload);

src/test/java/es/redmic/test/integration/mediastorage/ingestdata/CompressMediaStorageControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ public class CompressMediaStorageControllerTest extends BaseMediaStorageControll 
	MockMultipartFile multipartFile = getFile(INGEST_DATA_RESOURCES, FILENAME_COMPRESS, COMPRESS_CONTENT_TYPE);



	@Test

	public void checkSecurity_Return200_IfUploadCompressFileAsOAGUser() throws Exception {

	public void checkSecurity_Return200_IfUploadCompressFileAsManagerUser() throws Exception {



		MockHttpServletRequestBuilder fileUpload = multipart(BASE_MAPPING + CONTROLLER_UPLOAD_FILE).file(multipartFile)

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenOAGUser());

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenManagerUser());



		ResultActions result = mockMvc.perform(fileUpload);
@@ -66,7 +66,7 @@ public class CompressMediaStorageControllerTest extends BaseMediaStorageControll 


		MockHttpServletRequestBuilder fileUpload = multipart(BASE_MAPPING + CONTROLLER_UPLOAD_FILE)

				.file(getFile(PHOTO_RESOURCES, FILENAME_PHOTO, PHOTO_CONTENT_TYPE))

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenOAGUser());

				.contentType(MediaType.MULTIPART_FORM_DATA).header("Authorization", "Bearer " + getTokenManagerUser());



		ResultActions result = mockMvc.perform(fileUpload);