From c4dab9dbf4fdcde4aed72da199e2491e19d61ea0 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 28 Oct 2023 12:20:36 +0200 Subject: [PATCH] Update scalafmt-core to 3.7.15 (#513) --- .git-blame-ignore-revs | 3 +++ .scalafmt.conf | 2 +- .../org/mockito/stubbing/ScalaFirstStubbing.scala | 10 +++++----- .../org/mockito/stubbing/ScalaOngoingStubbing.scala | 10 +++++----- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 100f0420..c9f79efb 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.5.9 ff8ca52d610ca63ee0ab4fcfb5d79da13a1250b1 + +# Scala Steward: Reformat with scalafmt 3.7.15 +8fa2251b493a78759fc04a2f74189b9f8bdc07c4 diff --git a/.scalafmt.conf b/.scalafmt.conf index 8904fd90..92933215 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -7,5 +7,5 @@ rewrite.rules = [RedundantBraces, RedundantParens, SortImports] spaces.inImportCurlyBraces = true indentOperator.preset = spray -version=3.7.14 +version=3.7.15 diff --git a/common/src/main/scala/org/mockito/stubbing/ScalaFirstStubbing.scala b/common/src/main/scala/org/mockito/stubbing/ScalaFirstStubbing.scala index b4028d3a..ef65d8bd 100644 --- a/common/src/main/scala/org/mockito/stubbing/ScalaFirstStubbing.scala +++ b/common/src/main/scala/org/mockito/stubbing/ScalaFirstStubbing.scala @@ -27,7 +27,7 @@ case class ScalaFirstStubbing[T: ValueClassExtractor](delegate: OngoingStubbing[ * Sets consecutive return one or more values to be returned when the method is called. E.g: 
 when(mock.someMethod) thenReturn 1
    * 
 when(mock.someMethod) thenReturn (1, 2, 3)
* - * Last return value in the sequence (in example: 3) determines the behavior of further consecutive calls.

See examples in javadoc for {@link org.mockito.MockitoSugar#when} + * Last return value in the sequence (in example: 3) determines the behavior of further consecutive calls.

See examples in javadoc for {@@linkorg.mockito.MockitoSugar#when} * * @param value * first return value @@ -43,7 +43,7 @@ case class ScalaFirstStubbing[T: ValueClassExtractor](delegate: OngoingStubbing[ * 

 when(mock.someMethod) thenThrow (new RuntimeException, new OtherException)
* *

You can specify throwables to be thrown for consecutive calls. In that case the last throwable determines the behavior of further consecutive calls.

If throwable is - * null then exception will be thrown.

See examples in javadoc for {@link org.mockito.MockitoSugar#when} + * null then exception will be thrown.

See examples in javadoc for {@@linkorg.mockito.MockitoSugar#when} * * @param throwables * to be thrown on method invocation @@ -57,7 +57,7 @@ case class ScalaFirstStubbing[T: ValueClassExtractor](delegate: OngoingStubbing[ * * *

If the throwable class is a checked exception then it has to match one of the checked exceptions of the stubbed method signature.

If throwable is null then exception - * will be thrown.

See examples in javadoc for {@link Mockito#when} + * will be thrown.

See examples in javadoc for {@@linkMockito#when} * *

Note depending on the JVM, stack trace information may not be available in the generated throwable instance. If you require stack trace information, use {@link * OngoingStubbing#thenThrow(Throwable...)} instead. @@ -80,9 +80,9 @@ case class ScalaFirstStubbing[T: ValueClassExtractor](delegate: OngoingStubbing[ * * // calls real method: mock.someMethod(); * - * See also javadoc {@link Mockito#spy(Object)} to find out more about partial mocks. Mockito.spy() is a recommended way of creating partial mocks. The + * See also javadoc {@@linkMockito#spy(Object)} to find out more about partial mocks. Mockito.spy() is a recommended way of creating partial mocks. The * reason is it guarantees real methods are called against correctly constructed object because you're responsible for constructing the object passed to spy() method.

See - * examples in javadoc for {@link Mockito#when} + * examples in javadoc for {@@linkMockito#when} * * @return * object that allows stubbing consecutive calls diff --git a/common/src/main/scala/org/mockito/stubbing/ScalaOngoingStubbing.scala b/common/src/main/scala/org/mockito/stubbing/ScalaOngoingStubbing.scala index 85e45b4f..828ef9c5 100644 --- a/common/src/main/scala/org/mockito/stubbing/ScalaOngoingStubbing.scala +++ b/common/src/main/scala/org/mockito/stubbing/ScalaOngoingStubbing.scala @@ -15,7 +15,7 @@ case class ScalaOngoingStubbing[T: ValueClassExtractor](delegate: OngoingStubbin /** * Sets consecutive return values to be returned when the method is called. E.g: 

 when(mock.someMethod()).thenReturn(1, 2, 3);
* - * Last return value in the sequence (in example: 3) determines the behavior of further consecutive calls.

See examples in javadoc for {@link Mockito#when} + * Last return value in the sequence (in example: 3) determines the behavior of further consecutive calls.

See examples in javadoc for {@@linkMockito#when} * * @param value * first return value @@ -32,7 +32,7 @@ case class ScalaOngoingStubbing[T: ValueClassExtractor](delegate: OngoingStubbin * * If throwables contain a checked exception then it has to match one of the checked exceptions of method signature.

You can specify throwables to be thrown for consecutive * calls. In that case the last throwable determines the behavior of further consecutive calls.

If throwable is null then exception will be thrown.

See examples in - * javadoc for {@link Mockito#when} + * javadoc for {@@linkMockito#when} * * @param throwables * to be thrown on method invocation @@ -46,7 +46,7 @@ case class ScalaOngoingStubbing[T: ValueClassExtractor](delegate: OngoingStubbin * * *

If the throwable class is a checked exception then it has to match one of the checked exceptions of the stubbed method signature.

If throwable is null then exception - * will be thrown.

See examples in javadoc for {@link Mockito#when} + * will be thrown.

See examples in javadoc for {@@linkMockito#when} * *

Note depending on the JVM, stack trace information may not be available in the generated throwable instance. If you require stack trace information, use {@link * OngoingStubbing#thenThrow(Throwable...)} instead. @@ -69,9 +69,9 @@ case class ScalaOngoingStubbing[T: ValueClassExtractor](delegate: OngoingStubbin * * // calls real method: mock.someMethod(); * - * See also javadoc {@link Mockito#spy(Object)} to find out more about partial mocks. Mockito.spy() is a recommended way of creating partial mocks. The + * See also javadoc {@@linkMockito#spy(Object)} to find out more about partial mocks. Mockito.spy() is a recommended way of creating partial mocks. The * reason is it guarantees real methods are called against correctly constructed object because you're responsible for constructing the object passed to spy() method.

See - * examples in javadoc for {@link Mockito#when} + * examples in javadoc for {@@linkMockito#when} * * @return * object that allows stubbing consecutive calls