You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/08/30 05:03:55 UTC
[james-project] branch master updated: JAMES-3755 Fix merge conflict (#1167)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 18df1d540c JAMES-3755 Fix merge conflict (#1167)
18df1d540c is described below
commit 18df1d540c2824dec6e2599d8956f0ccf944fec8
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Tue Aug 30 12:03:51 2022 +0700
JAMES-3755 Fix merge conflict (#1167)
---
.../src/test/java/org/apache/james/rspamd/RspamdScannerTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdScannerTest.java b/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdScannerTest.java
index d9f2f31d05..94c3ab17ad 100644
--- a/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdScannerTest.java
+++ b/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdScannerTest.java
@@ -24,6 +24,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.InputStream;
import java.util.Collection;
import java.util.Optional;
@@ -228,7 +229,7 @@ class RspamdScannerTest {
@Test
void serviceShouldMoveRejetedEmailToTheSpamProcessor() throws Exception {
RspamdHttpClient rspamdHttpClient = mock(RspamdHttpClient.class);
- when(rspamdHttpClient.checkV2(any())).thenReturn(Mono.just(AnalysisResult.builder()
+ when(rspamdHttpClient.checkV2(any(Mail.class))).thenReturn(Mono.just(AnalysisResult.builder()
.action(AnalysisResult.Action.REJECT)
.score(12.1F)
.requiredScore(14F)
@@ -261,7 +262,7 @@ class RspamdScannerTest {
@Test
void serviceShouldNotMoveRejetedEmailWhenNoSpamProcessor() throws Exception {
RspamdHttpClient rspamdHttpClient = mock(RspamdHttpClient.class);
- when(rspamdHttpClient.checkV2(any())).thenReturn(Mono.just(AnalysisResult.builder()
+ when(rspamdHttpClient.checkV2(any(Mail.class))).thenReturn(Mono.just(AnalysisResult.builder()
.action(AnalysisResult.Action.REJECT)
.score(12.1F)
.requiredScore(14F)
@@ -293,7 +294,7 @@ class RspamdScannerTest {
@Test
void serviceShouldNotMoveLegitimateEmailToSpamProcessor() throws Exception {
RspamdHttpClient rspamdHttpClient = mock(RspamdHttpClient.class);
- when(rspamdHttpClient.checkV2(any())).thenReturn(Mono.just(AnalysisResult.builder()
+ when(rspamdHttpClient.checkV2(any(Mail.class))).thenReturn(Mono.just(AnalysisResult.builder()
.action(AnalysisResult.Action.ADD_HEADER)
.score(12.1F)
.requiredScore(14F)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org