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 2020/11/20 10:09:24 UTC
[james-project] 01/16: JAMES-2884 [REFACTORING] Use Either instead
of SMono for request validation
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
commit 46eba7085edb121391db63343c88b8421f4ff0f6
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Nov 20 16:50:24 2020 +0700
JAMES-2884 [REFACTORING] Use Either instead of SMono for request validation
---
.../test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala
index 6bbce45..8521824 100644
--- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala
+++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala
@@ -49,10 +49,11 @@ import org.apache.james.metrics.tests.RecordingMetricFactory
import org.apache.james.user.memory.MemoryUsersRepository
import org.hamcrest.Matchers.equalTo
import org.mockito.ArgumentMatchers.any
-import org.mockito.Mockito.{doThrow, mock, when}
+import org.mockito.Mockito.{doReturn, doThrow, mock, when}
import org.scalatest.BeforeAndAfter
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
+import reactor.core.scala.publisher.SFlux
object JMAPApiRoutesTest {
private val TEST_CONFIGURATION: JMAPConfiguration = JMAPConfiguration.builder().enable().randomPort().build()
@@ -433,7 +434,7 @@ class JMAPApiRoutesTest extends AnyFlatSpec with BeforeAndAfter with Matchers {
"RFC-8621 with random error when processing request " should "return 200, with serverFail error, others method call proceed normally" in {
val mockCoreEchoMethod = mock(classOf[CoreEchoMethod])
- doThrow(new RuntimeException("Unexpected Exception occur, the others method may proceed normally"))
+ doReturn(SFlux.raiseError(new RuntimeException("Unexpected Exception occur, the others method may proceed normally")))
.doCallRealMethod()
.when(mockCoreEchoMethod)
.process(any[Set[CapabilityIdentifier]], any(), any())
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org