RDBC-885 Add 7.0 to GHA RavenDB version matrix (node.js/java)

.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:

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")
         };
 

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");
+    }
+}

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 {
+}

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" +
                     " }))");
         }

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

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
@@ -22,10 +24,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 +45,7 @@ public void canGetAndSetLogging() throws Exception {
                         .isEqualTo(LogMode.INFORMATION);
 
                 assertThat(logsConfig.getMode())
-                        .isEqualTo(LogMode.NONE);
+                        .isEqualTo(LogMode.OPERATIONS);
             } finally {
                 // try to clean up