Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework TaskControllerTests to fix shouldGetTaskLogsWhenAuthenticated #536

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Rework TaskControllerTests to fix shouldGetTaskLogsWhenAuthenticated #536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions src/test/java/com/iexec/core/task/TaskControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,31 @@
import com.iexec.common.chain.eip712.entity.EIP712Challenge;
import com.iexec.common.replicate.ComputeLogs;
import com.iexec.common.task.TaskDescription;
import com.iexec.common.utils.CredentialsUtils;
import com.iexec.core.chain.IexecHubService;
import com.iexec.core.logs.TaskLogs;
import com.iexec.core.logs.TaskLogsService;
import com.iexec.core.replicate.Replicate;
import com.iexec.core.replicate.ReplicateModel;
import com.iexec.core.replicate.ReplicatesService;
import com.iexec.core.security.EIP712ChallengeService;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import lombok.SneakyThrows;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.web3j.crypto.Credentials;
import org.web3j.crypto.ECKeyPair;
import org.web3j.crypto.Keys;

import java.math.BigInteger;
import java.security.InvalidAlgorithmParameterException;
import java.security.Key;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.List;
import java.util.Optional;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;

@Slf4j
class TaskControllerTests {

private static final String TASK_ID = "0xtask";
Expand All @@ -72,21 +65,22 @@ class TaskControllerTests {
@InjectMocks private TaskController taskController;

@BeforeEach
void setUp() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
@SneakyThrows
void setUp() {
MockitoAnnotations.openMocks(this);
EIP712Domain domain = new EIP712Domain();
challenge = new EIP712Challenge(domain, Challenge.builder().challenge("challenge").build());
badChallenge = new EIP712Challenge(domain, Challenge.builder().challenge("bad-challenge").build());
ecKeyPair = Keys.createEcKeyPair();
requesterAddress = CredentialsUtils.getAddress(String.format("0x%032x", ecKeyPair.getPrivateKey()));
requesterAddress = Credentials.create(ecKeyPair).getAddress();
signature = challenge.signMessage(ecKeyPair);
}

//region utilities
String generateWalletAddress() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
@SneakyThrows
String generateWalletAddress() {
ECKeyPair ecKeyPair = Keys.createEcKeyPair();
BigInteger pk = ecKeyPair.getPrivateKey();
return CredentialsUtils.getAddress(String.format("0x%032x", pk));
return Credentials.create(ecKeyPair).getAddress();
}
//endregion

Expand Down Expand Up @@ -208,7 +202,7 @@ void shouldGetTaskLogsWhenAuthenticated() {
when(challengeService.getChallenge(requesterAddress)).thenReturn(challenge);
when(taskLogsService.getTaskLogs(TASK_ID)).thenReturn(Optional.of(taskStdout));
ResponseEntity<TaskLogs> response = taskController.getTaskLogs(TASK_ID, authorization);
assertTrue(response.getStatusCode().is2xxSuccessful());
assertEquals(HttpStatus.OK, response.getStatusCode());
verify(iexecHubService).getTaskDescription(TASK_ID);
}

Expand Down Expand Up @@ -248,11 +242,10 @@ void shouldFailToGetTaskLogsWhenInvalidAuthorization() {
}

@Test
void shouldFailToGetTaskLogsWhenNotTaskRequester()
throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
void shouldFailToGetTaskLogsWhenNotTaskRequester() {
String notRequesterAddress = generateWalletAddress();
TaskDescription description = TaskDescription.builder()
.requester(CredentialsUtils.getAddress(notRequesterAddress))
.requester(notRequesterAddress)
.build();
String authorization = String.join("_", challenge.getHash(), signature, requesterAddress);
when(iexecHubService.getTaskDescription(TASK_ID)).thenReturn(description);
Expand All @@ -275,7 +268,7 @@ void shouldGetComputeLogsWhenAuthenticated() {
when(challengeService.getChallenge(requesterAddress)).thenReturn(challenge);
when(taskLogsService.getComputeLogs(TASK_ID, WORKER_ADDRESS)).thenReturn(Optional.of(computeLogs));
ResponseEntity<ComputeLogs> response = taskController.getComputeLogs(TASK_ID, WORKER_ADDRESS, authorization);
assertTrue(response.getStatusCode().is2xxSuccessful());
assertEquals(HttpStatus.OK, response.getStatusCode());
verify(iexecHubService).getTaskDescription(TASK_ID);
}

Expand Down Expand Up @@ -315,11 +308,10 @@ void shouldFailToGetComputeLogsWhenInvalidAuthorization() {
}

@Test
void shouldFailToGetComputeLogsWhenNotTaskRequester()
throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException {
void shouldFailToGetComputeLogsWhenNotTaskRequester() {
String notRequesterAddress = generateWalletAddress();
TaskDescription description = TaskDescription.builder()
.requester(CredentialsUtils.getAddress(notRequesterAddress))
.requester(notRequesterAddress)
.build();
String authorization = String.join("_", challenge.getHash(), signature, requesterAddress);
when(iexecHubService.getTaskDescription(TASK_ID)).thenReturn(description);
Expand Down