Skip to content

Commit

Permalink
Merge pull request #81 from ml054/v5.4
Browse files Browse the repository at this point in the history
fix
  • Loading branch information
ml054 authored Dec 1, 2023
2 parents be9b7f8 + 4cab977 commit 3d116be
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,14 @@ public static class TestConnectionFeatures {
subscriptions51000Features.subscription.timeSeriesIncludes = true;
subscriptionFeaturesMap.put(SUBSCRIPTION_TIME_SERIES_INCLUDES, subscriptions51000Features);

SupportedFeatures subscriptions5300Features = new SupportedFeatures(TCP_CONNECTIONS_WITH_COMPRESSION);
subscriptions5300Features.dataCompression = true;
subscriptions51000Features.subscription = new SupportedFeatures.SubscriptionFeatures();
subscriptions51000Features.subscription.includes = true;
subscriptions51000Features.subscription.counterIncludes = true;
subscriptions51000Features.subscription.timeSeriesIncludes = true;

subscriptionFeaturesMap.put(TCP_CONNECTIONS_WITH_COMPRESSION, subscriptions5300Features);
SupportedFeatures subscriptions53000Features = new SupportedFeatures(TCP_CONNECTIONS_WITH_COMPRESSION);
subscriptions53000Features.dataCompression = true;
subscriptions53000Features.subscription = new SupportedFeatures.SubscriptionFeatures();
subscriptions53000Features.subscription.includes = true;
subscriptions53000Features.subscription.counterIncludes = true;
subscriptions53000Features.subscription.timeSeriesIncludes = true;

subscriptionFeaturesMap.put(TCP_CONNECTIONS_WITH_COMPRESSION, subscriptions53000Features);

Map<Integer, SupportedFeatures> heartbeatsFeaturesMap = new HashMap<>();
supportedFeaturesByProtocol.put(OperationTypes.HEARTBEATS, heartbeatsFeaturesMap);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
import net.ravendb.client.documents.IDocumentStore;
import net.ravendb.client.http.LoadBalanceBehavior;
import net.ravendb.client.http.ReadBalanceBehavior;
import net.ravendb.client.infrastructure.DisabledOnPullRequest;
import net.ravendb.client.serverwide.operations.configuration.GetServerWideClientConfigurationOperation;
import net.ravendb.client.serverwide.operations.configuration.PutServerWideClientConfigurationOperation;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;

@DisabledOnPullRequest
public class ClientConfigurationTest extends RemoteTestBase {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import net.ravendb.client.documents.session.IDocumentSession;
import net.ravendb.client.documents.session.IMetadataDictionary;
import net.ravendb.client.exceptions.RavenException;
import net.ravendb.client.infrastructure.DisabledOnPullRequest;
import net.ravendb.client.infrastructure.entities.Company;
import org.junit.jupiter.api.Test;

Expand All @@ -17,6 +18,7 @@

import static org.assertj.core.api.Assertions.*;

@DisabledOnPullRequest
public class ForceRevisionCreationTest extends RemoteTestBase {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import net.ravendb.client.documents.subscriptions.SubscriptionBatch;
import net.ravendb.client.documents.subscriptions.SubscriptionCreationOptions;
import net.ravendb.client.documents.subscriptions.SubscriptionWorker;
import net.ravendb.client.infrastructure.DisabledOnPullRequest;
import org.junit.jupiter.api.Test;

import java.util.concurrent.CompletableFuture;
Expand All @@ -16,6 +17,7 @@

import static org.assertj.core.api.Assertions.assertThat;

@DisabledOnPullRequest
public class RavenDB_11166Test extends RemoteTestBase {

private final int _reasonableWaitTime = 15;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
import net.ravendb.client.RemoteTestBase;
import net.ravendb.client.documents.IDocumentStore;
import net.ravendb.client.documents.session.IDocumentSession;
import net.ravendb.client.infrastructure.DisabledOnPullRequest;
import net.ravendb.client.infrastructure.entities.Company;
import org.junit.jupiter.api.Test;

import java.util.Date;

import static org.assertj.core.api.Assertions.assertThat;

@DisabledOnPullRequest
public class RavenDB_11770Test extends RemoteTestBase {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.ravendb.client.documents.operations.refresh.RefreshConfiguration;
import net.ravendb.client.documents.session.IDocumentSession;
import net.ravendb.client.exceptions.TimeoutException;
import net.ravendb.client.infrastructure.DisabledOnPullRequest;
import net.ravendb.client.infrastructure.entities.User;
import net.ravendb.client.primitives.NetISO8601Utils;
import org.apache.commons.lang3.time.DateUtils;
Expand All @@ -17,6 +18,7 @@

import static org.assertj.core.api.Assertions.assertThat;

@DisabledOnPullRequest
public class RavenDB_13735Test extends RemoteTestBase {

private void setupRefresh(IDocumentStore store) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import net.ravendb.client.documents.subscriptions.Revision;
import net.ravendb.client.documents.subscriptions.SubscriptionWorker;
import net.ravendb.client.documents.subscriptions.SubscriptionWorkerOptions;
import net.ravendb.client.infrastructure.DisabledOnPullRequest;
import net.ravendb.client.infrastructure.entities.User;
import org.junit.jupiter.api.Test;

Expand All @@ -19,6 +20,7 @@

import static org.assertj.core.api.Assertions.assertThat;

@DisabledOnPullRequest
public class RavenDB_13762Test extends RemoteTestBase {

private final int _reasonableWaitTime = 15;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
import net.ravendb.client.documents.indexes.AbstractIndexCreationTask;
import net.ravendb.client.documents.session.IDocumentQuery;
import net.ravendb.client.documents.session.IDocumentSession;
import net.ravendb.client.infrastructure.DisabledOnPullRequest;
import net.ravendb.client.json.MetadataAsDictionary;
import org.junit.jupiter.api.Test;

import java.util.*;

import static org.assertj.core.api.Assertions.assertThat;

@DisabledOnPullRequest
public class CanQueryAndIncludeRevisionsTest extends RemoteTestBase {

@Test
Expand Down

0 comments on commit 3d116be

Please sign in to comment.