From 4c9a8ec257152ddfca0ec4f23027f40f4a934f1d Mon Sep 17 00:00:00 2001 From: Alex Tymchenko Date: Sat, 26 Aug 2023 16:11:36 +0100 Subject: [PATCH 1/5] Bump the version -> `2.0.0-SNAPSHOT.157`. --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 0f768c4ad8..d6ace7cb82 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -29,4 +29,4 @@ * * For versions of Spine-based dependencies, please see [io.spine.internal.dependency.Spine]. */ -val versionToPublish: String by extra("2.0.0-SNAPSHOT.156") +val versionToPublish: String by extra("2.0.0-SNAPSHOT.157") From 58703366753ff53d67d0b419e8b1350bf61f3930 Mon Sep 17 00:00:00 2001 From: Alex Tymchenko Date: Sat, 26 Aug 2023 16:11:47 +0100 Subject: [PATCH 2/5] Update the report files. --- license-report.md | 24 ++++++++++++------------ pom.xml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/license-report.md b/license-report.md index e9d6a3c239..3fb92d4317 100644 --- a/license-report.md +++ b/license-report.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine:spine-client:2.0.0-SNAPSHOT.156` +# Dependencies of `io.spine:spine-client:2.0.0-SNAPSHOT.157` ## Runtime 1. **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4. @@ -804,12 +804,12 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Tue Aug 22 21:20:20 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 15:37:37 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine:spine-core:2.0.0-SNAPSHOT.156` +# Dependencies of `io.spine:spine-core:2.0.0-SNAPSHOT.157` ## Runtime 1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2. @@ -1573,12 +1573,12 @@ This report was generated on **Tue Aug 22 21:20:20 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Tue Aug 22 21:20:20 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 15:37:38 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine:spine-server:2.0.0-SNAPSHOT.156` +# Dependencies of `io.spine:spine-server:2.0.0-SNAPSHOT.157` ## Runtime 1. **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4. @@ -2390,12 +2390,12 @@ This report was generated on **Tue Aug 22 21:20:20 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Tue Aug 22 21:20:21 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 15:37:38 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:spine-testutil-client:2.0.0-SNAPSHOT.156` +# Dependencies of `io.spine.tools:spine-testutil-client:2.0.0-SNAPSHOT.157` ## Runtime 1. **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4. @@ -3327,12 +3327,12 @@ This report was generated on **Tue Aug 22 21:20:21 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Tue Aug 22 21:20:21 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 15:37:39 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:spine-testutil-core:2.0.0-SNAPSHOT.156` +# Dependencies of `io.spine.tools:spine-testutil-core:2.0.0-SNAPSHOT.157` ## Runtime 1. **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4. @@ -4264,12 +4264,12 @@ This report was generated on **Tue Aug 22 21:20:21 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Tue Aug 22 21:20:22 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 15:37:39 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). -# Dependencies of `io.spine.tools:spine-testutil-server:2.0.0-SNAPSHOT.156` +# Dependencies of `io.spine.tools:spine-testutil-server:2.0.0-SNAPSHOT.157` ## Runtime 1. **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4. @@ -5249,4 +5249,4 @@ This report was generated on **Tue Aug 22 21:20:22 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Tue Aug 22 21:20:22 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file +This report was generated on **Sat Aug 26 15:37:40 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8181609118..fad569d65b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject. --> io.spine spine-core-java -2.0.0-SNAPSHOT.156 +2.0.0-SNAPSHOT.157 2015 From dc552cd3bf1b90f7133d80029165ab5d48234a67 Mon Sep 17 00:00:00 2001 From: Alex Tymchenko Date: Sat, 26 Aug 2023 16:35:59 +0100 Subject: [PATCH 3/5] Make the slow tests overridable again (as per the documentation of this type!) --- .../io/spine/server/delivery/CatchUpTest.java | 95 +++++++++++-------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/server/src/test/java/io/spine/server/delivery/CatchUpTest.java b/server/src/test/java/io/spine/server/delivery/CatchUpTest.java index b191cef4f6..3812ad3bd4 100644 --- a/server/src/test/java/io/spine/server/delivery/CatchUpTest.java +++ b/server/src/test/java/io/spine/server/delivery/CatchUpTest.java @@ -43,7 +43,6 @@ import io.spine.testing.SlowTest; import io.spine.testing.server.blackbox.BlackBox; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -104,45 +103,56 @@ private static void clearCatchUps() { .clear(); } - @Nested - @DisplayName("given the time is provided with nanosecond resolution") - class NanosecondsResolution { - - @Test - @DisplayName("catch up only particular instances by their IDs") - public void withNanosByIds() throws InterruptedException { - testCatchUpByIds(); - } - - @Test - @DisplayName("catch up all of projection instances " + - "and respect the order of the delivered events") - public void withNanosAllInOrder() throws InterruptedException { - testCatchUpAll(); - } + /** + * This test is intentionally left {@code public}. + * + *

See the class-level docs. + */ + @Test + @DisplayName("given the time is provided with nanosecond resolution " + + "catch up only particular instances by their IDs") + public void withNanosByIds() throws InterruptedException { + testCatchUpByIds(); } - @Nested - @DisplayName("given the time is provided with millisecond resolution") - class MillisecondResolution { - - @BeforeEach - void useMillis() { - setupMillis(); - } + /** + * This test is intentionally left {@code public}. + * + *

See the class-level docs. + */ + @Test + @DisplayName("given the time is provided with nanosecond resolution" + + " catch up all of projection instances " + + "and respect the order of the delivered events") + public void withNanosAllInOrder() throws InterruptedException { + testCatchUpAll(); + } - @Test - @DisplayName("catch up only particular instances by their IDs") - public void withMillisByIds() throws InterruptedException { - testCatchUpByIds(); - } + /** + * This test is intentionally left {@code public}. + * + *

See the class-level docs. + */ + @Test + @DisplayName("given the time is provided with millisecond resolution" + + " catch up only particular instances by their IDs") + public void withMillisByIds() throws InterruptedException { + setupMillis(); + testCatchUpByIds(); + } - @Test - @DisplayName("catch up all of projection instances and " + - "respect the order of the delivered events") - public void withMillisAllInOrder() throws InterruptedException { - testCatchUpAll(); - } + /** + * This test is intentionally left {@code public}. + * + *

See the class-level docs. + */ + @Test + @DisplayName("given the time is provided with millisecond resolution " + + "catch up all of projection instances and " + + "respect the order of the delivered events") + public void withMillisAllInOrder() throws InterruptedException { + setupMillis(); + testCatchUpAll(); } @Test @@ -333,7 +343,8 @@ private static void testCatchUpAll() throws InterruptedException { var maybeState = projectionRepo.find(identifier); assertThat(maybeState).isPresent(); - var state = maybeState.get().state(); + var state = maybeState.get() + .state(); assertThat(state.getLastValue()).isEqualTo(negativeExpected); } } @@ -345,9 +356,9 @@ private static Timestamp aMinuteAgo() { private static List readLastValues(ConsecutiveProjection.Repo repo, String[] ids) { return Arrays.stream(ids) - .map((id) -> findView(repo, id).state() - .getLastValue()) - .collect(toList()); + .map((id) -> findView(repo, id).state() + .getLastValue()) + .collect(toList()); } private static List generateEmissionCommands(int howMany, String[] ids) { @@ -364,8 +375,8 @@ private static List generateEmissionCommands(int howMany, String private static List> asPostCommandJobs(BlackBox ctx, List commands) { return commands.stream() - .map(cmd -> (Callable) () -> ctx.receivesCommand(cmd)) - .collect(toList()); + .map(cmd -> (Callable) () -> ctx.receivesCommand(cmd)) + .collect(toList()); } private static void setupMillis() { From 282df09a97cf87759b8f8df586404685398eb52f Mon Sep 17 00:00:00 2001 From: Alex Tymchenko Date: Sat, 26 Aug 2023 16:36:17 +0100 Subject: [PATCH 4/5] Update the report once again. --- license-report.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/license-report.md b/license-report.md index 3fb92d4317..fcc3813079 100644 --- a/license-report.md +++ b/license-report.md @@ -804,7 +804,7 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Aug 26 15:37:37 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 16:31:38 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). @@ -1573,7 +1573,7 @@ This report was generated on **Sat Aug 26 15:37:37 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Aug 26 15:37:38 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 16:31:39 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). @@ -2390,7 +2390,7 @@ This report was generated on **Sat Aug 26 15:37:38 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Aug 26 15:37:38 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 16:31:39 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). @@ -3327,7 +3327,7 @@ This report was generated on **Sat Aug 26 15:37:38 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Aug 26 15:37:39 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 16:31:39 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). @@ -4264,7 +4264,7 @@ This report was generated on **Sat Aug 26 15:37:39 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Aug 26 15:37:39 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). +This report was generated on **Sat Aug 26 16:31:40 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). @@ -5249,4 +5249,4 @@ This report was generated on **Sat Aug 26 15:37:39 WEST 2023** using [Gradle-Lic The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Sat Aug 26 15:37:40 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file +This report was generated on **Sat Aug 26 16:31:40 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE). \ No newline at end of file From f9ff03f0d7dc131d2ddb97f50a6748548cb71eab Mon Sep 17 00:00:00 2001 From: Alex Tymchenko Date: Sun, 27 Aug 2023 10:50:43 +0100 Subject: [PATCH 5/5] Try pushing a commit to trigger builds. --- .../src/test/java/io/spine/server/delivery/CatchUpTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/io/spine/server/delivery/CatchUpTest.java b/server/src/test/java/io/spine/server/delivery/CatchUpTest.java index 3812ad3bd4..e6616e4a56 100644 --- a/server/src/test/java/io/spine/server/delivery/CatchUpTest.java +++ b/server/src/test/java/io/spine/server/delivery/CatchUpTest.java @@ -384,8 +384,8 @@ private static void setupMillis() { } /** - * A time provider which provides the current time based upon JDK's wall clock, i.e. without - * the emulated nanoseconds. + * A time provider which provides the current time based upon JDK's wall clock, + * i.e. without the emulated nanoseconds. */ private static class WithMillisOnlyResolution implements Time.Provider {