From 46e4dc6a0a66dc3f4bcbd51bbdbee7d82bb4d5f4 Mon Sep 17 00:00:00 2001 From: Marcin Lewandowski Date: Mon, 13 Jan 2025 15:10:36 +0100 Subject: [PATCH 1/2] RDBC-885 Add 7.0 to GHA RavenDB version matrix (node.js/java) --- .github/workflows/RavenClient.yml | 2 +- .../java/net/ravendb/client/driver/RavenServerRunner.java | 1 - .../ravendb/client/test/server/LogsConfigurationTest.java | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/RavenClient.yml b/.github/workflows/RavenClient.yml index 52d52f4fc..9f106cabb 100644 --- a/.github/workflows/RavenClient.yml +++ b/.github/workflows/RavenClient.yml @@ -29,7 +29,7 @@ jobs: strategy: matrix: java-version: [8, 11, 14, 16, 17, 21] - serverVersion: ["6.0", "6.2"] + serverVersion: ["6.0", "6.2", "7.0"] fail-fast: false steps: diff --git a/src/test/java/net/ravendb/client/driver/RavenServerRunner.java b/src/test/java/net/ravendb/client/driver/RavenServerRunner.java index ba5ebf463..93efc21f5 100644 --- a/src/test/java/net/ravendb/client/driver/RavenServerRunner.java +++ b/src/test/java/net/ravendb/client/driver/RavenServerRunner.java @@ -34,7 +34,6 @@ private static ProcessStartInfo getProcessStartInfo(RavenServerLocator locator) "--RunInMemory=true", "--License.Eula.Accepted=true", "--Setup.Mode=None", - "--Logs.Mode=None", "--Testing.ParentProcessId=" + getProcessId("0") }; diff --git a/src/test/java/net/ravendb/client/test/server/LogsConfigurationTest.java b/src/test/java/net/ravendb/client/test/server/LogsConfigurationTest.java index 9260dcf0a..596c8a2de 100644 --- a/src/test/java/net/ravendb/client/test/server/LogsConfigurationTest.java +++ b/src/test/java/net/ravendb/client/test/server/LogsConfigurationTest.java @@ -22,10 +22,10 @@ public void canGetAndSetLogging() throws Exception { store.maintenance().server().send(getOperation); assertThat(logsConfig.getCurrentMode()) - .isEqualTo(LogMode.NONE); + .isEqualTo(LogMode.OPERATIONS); assertThat(logsConfig.getMode()) - .isEqualTo(LogMode.NONE); + .isEqualTo(LogMode.OPERATIONS); // now try to set mode to operations and info SetLogsConfigurationOperation.Parameters parameters = new SetLogsConfigurationOperation.Parameters(); @@ -43,7 +43,7 @@ public void canGetAndSetLogging() throws Exception { .isEqualTo(LogMode.INFORMATION); assertThat(logsConfig.getMode()) - .isEqualTo(LogMode.NONE); + .isEqualTo(LogMode.OPERATIONS); } finally { // try to clean up From 7078269a1db528e619d5aae5833e76da9766ce1f Mon Sep 17 00:00:00 2001 From: Marcin Lewandowski Date: Mon, 13 Jan 2025 20:17:24 +0100 Subject: [PATCH 2/2] RDBC-885 Add 7.0 to GHA RavenDB version matrix - fixing v7.0 tests --- .../DisableOn70ServerCondition.java | 22 +++++++++++++++++++ .../infrastructure/DisabledOn70Server.java | 14 ++++++++++++ .../BasicTimeSeriesIndexes_JavaScript.java | 2 +- .../client/test/issues/RavenDB_11440Test.java | 2 ++ .../test/server/LogsConfigurationTest.java | 2 ++ 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/test/java/net/ravendb/client/infrastructure/DisableOn70ServerCondition.java create mode 100644 src/test/java/net/ravendb/client/infrastructure/DisabledOn70Server.java diff --git a/src/test/java/net/ravendb/client/infrastructure/DisableOn70ServerCondition.java b/src/test/java/net/ravendb/client/infrastructure/DisableOn70ServerCondition.java new file mode 100644 index 000000000..163766ec5 --- /dev/null +++ b/src/test/java/net/ravendb/client/infrastructure/DisableOn70ServerCondition.java @@ -0,0 +1,22 @@ +package net.ravendb.client.infrastructure; + +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; + +public class DisableOn70ServerCondition implements ExecutionCondition { + + public static final String ENV_RAVENDB_SERVER_VERSION = "RAVENDB_SERVER_VERSION"; + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) { + String ravenServerVersion = System.getenv(ENV_RAVENDB_SERVER_VERSION); + + if (StringUtils.isEmpty(ravenServerVersion) || ravenServerVersion.compareTo("7.0") > 0) { + return ConditionEvaluationResult.disabled("Test disabled on 7.0 server"); + } + + return ConditionEvaluationResult.enabled("Test enabled"); + } +} diff --git a/src/test/java/net/ravendb/client/infrastructure/DisabledOn70Server.java b/src/test/java/net/ravendb/client/infrastructure/DisabledOn70Server.java new file mode 100644 index 000000000..0c55eb7f9 --- /dev/null +++ b/src/test/java/net/ravendb/client/infrastructure/DisabledOn70Server.java @@ -0,0 +1,14 @@ +package net.ravendb.client.infrastructure; + +import org.junit.jupiter.api.extension.ExtendWith; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ ElementType.TYPE, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +@ExtendWith(DisableOn70ServerCondition.class) +public @interface DisabledOn70Server { +} diff --git a/src/test/java/net/ravendb/client/test/client/indexing/timeSeries/BasicTimeSeriesIndexes_JavaScript.java b/src/test/java/net/ravendb/client/test/client/indexing/timeSeries/BasicTimeSeriesIndexes_JavaScript.java index 886499292..d5c116dc9 100644 --- a/src/test/java/net/ravendb/client/test/client/indexing/timeSeries/BasicTimeSeriesIndexes_JavaScript.java +++ b/src/test/java/net/ravendb/client/test/client/indexing/timeSeries/BasicTimeSeriesIndexes_JavaScript.java @@ -100,7 +100,7 @@ public AverageHeartRateDaily_ByDateAndCity() { " .aggregate(g => ({\n" + " heartBeat: g.values.reduce((total, val) => val.heartBeat + total, 0) / g.values.reduce((total, val) => val.count + total, 0),\n" + " date: g.key.date,\n" + - " city: g.key.city\n" + + " city: g.key.city,\n" + " count: g.values.reduce((total, val) => val.count + total, 0)\n" + " }))"); } diff --git a/src/test/java/net/ravendb/client/test/issues/RavenDB_11440Test.java b/src/test/java/net/ravendb/client/test/issues/RavenDB_11440Test.java index 8d28980e1..768c2daaa 100644 --- a/src/test/java/net/ravendb/client/test/issues/RavenDB_11440Test.java +++ b/src/test/java/net/ravendb/client/test/issues/RavenDB_11440Test.java @@ -2,6 +2,7 @@ import net.ravendb.client.RemoteTestBase; import net.ravendb.client.documents.IDocumentStore; +import net.ravendb.client.infrastructure.DisabledOn70Server; import net.ravendb.client.serverwide.operations.logs.GetLogsConfigurationOperation; import net.ravendb.client.serverwide.operations.logs.GetLogsConfigurationResult; import net.ravendb.client.serverwide.operations.logs.LogMode; @@ -12,6 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@DisabledOn70Server public class RavenDB_11440Test extends RemoteTestBase { @Test diff --git a/src/test/java/net/ravendb/client/test/server/LogsConfigurationTest.java b/src/test/java/net/ravendb/client/test/server/LogsConfigurationTest.java index 596c8a2de..891caea4f 100644 --- a/src/test/java/net/ravendb/client/test/server/LogsConfigurationTest.java +++ b/src/test/java/net/ravendb/client/test/server/LogsConfigurationTest.java @@ -2,6 +2,7 @@ import net.ravendb.client.RemoteTestBase; import net.ravendb.client.documents.IDocumentStore; +import net.ravendb.client.infrastructure.DisabledOn70Server; import net.ravendb.client.serverwide.operations.logs.GetLogsConfigurationOperation; import net.ravendb.client.serverwide.operations.logs.GetLogsConfigurationResult; import net.ravendb.client.serverwide.operations.logs.LogMode; @@ -10,6 +11,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@DisabledOn70Server public class LogsConfigurationTest extends RemoteTestBase { @Test