Skip to content

Commit 342faa6

Browse files
committed
Simplify IexecHubService instance creation in tests
1 parent a30b825 commit 342faa6

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

src/test/java/com/iexec/worker/chain/IexecHubServiceTests.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.junit.jupiter.params.provider.EnumSource;
2828
import org.mockito.Mock;
2929
import org.mockito.MockedStatic;
30-
import org.mockito.Mockito;
3130
import org.mockito.MockitoAnnotations;
3231
import org.springframework.test.util.ReflectionTestUtils;
3332
import org.web3j.crypto.Credentials;
@@ -37,10 +36,8 @@
3736
import org.web3j.protocol.core.RemoteFunctionCall;
3837
import org.web3j.protocol.core.methods.response.Log;
3938
import org.web3j.protocol.core.methods.response.TransactionReceipt;
40-
import org.web3j.tx.TransactionManager;
4139
import org.web3j.utils.Numeric;
4240

43-
import java.math.BigInteger;
4441
import java.time.Duration;
4542
import java.util.List;
4643
import java.util.Optional;
@@ -79,21 +76,13 @@ class IexecHubServiceTests {
7976
@BeforeEach
8077
void init() throws Exception {
8178
MockitoAnnotations.openMocks(this);
82-
when(blockchainAdapterConfigurationService.getIexecHubContractAddress()).thenReturn("hub");
79+
when(blockchainAdapterConfigurationService.getIexecHubContractAddress()).thenReturn("0x748e091bf16048cb5103E0E10F9D5a8b7fBDd860");
8380
when(blockchainAdapterConfigurationService.getBlockTime()).thenReturn(Duration.ofSeconds(5L));
8481
when(blockchainAdapterConfigurationService.getChainId()).thenReturn(65535);
8582
credentials = Credentials.create(Keys.createEcKeyPair());
8683
when(credentialsService.getCredentials()).thenReturn(credentials);
8784
when(web3jService.getWeb3j()).thenReturn(web3jClient);
88-
try (MockedStatic<IexecHubContract> iexecHubContract = Mockito.mockStatic(IexecHubContract.class)) {
89-
final IexecHubContract mockIexecContract = mock(IexecHubContract.class);
90-
final RemoteFunctionCall<BigInteger> mockRemoteFunctionCall = mock(RemoteFunctionCall.class);
91-
iexecHubContract.when(() -> IexecHubContract.load(any(), any(), (TransactionManager) any(), any()))
92-
.thenReturn(mockIexecContract);
93-
when(mockIexecContract.contribution_deadline_ratio()).thenReturn(mockRemoteFunctionCall);
94-
when(mockRemoteFunctionCall.send()).thenReturn(BigInteger.ONE);
95-
iexecHubService = spy(new IexecHubService(credentialsService, web3jService, blockchainAdapterConfigurationService));
96-
}
85+
iexecHubService = spy(new IexecHubService(credentialsService, web3jService, blockchainAdapterConfigurationService));
9786
ReflectionTestUtils.setField(iexecHubService, "iexecHubContract", iexecHubContract);
9887
}
9988

@@ -205,7 +194,7 @@ void shouldNotContributeRevealWhenInterrupted() throws ExecutionException, Inter
205194
assertThat(Thread.currentThread().isInterrupted()).isTrue();
206195
}
207196
}
208-
// end region
197+
// endregion
209198

210199
// region contributeAndFinalize
211200
@Test

0 commit comments

Comments
 (0)