Merge pull request #257 from ml054/v4.2

V4.2

Author: gregolsky

src/Documents/Changes/ChangesObservable.ts

@@ -59,11 +59,12 @@ export class ChangesObservable<T, TConnectionState extends IChangesConnectionSta
     public off(event: "error", handler: (error: Error) => void);
     public off(event: "data" | "error", handler: ((value: T) => void) | ((error: Error) => void)) {
 
-        this._connectionState.dec();
-
         switch (event) {
             case "data":
-                this._subscribers.delete(handler as (value: T) => void);
+                if (this._subscribers.delete(handler as (value: T) => void)) {
+                    this._connectionState.dec();
+                }
+
                 if (!this._subscribers.size) {
                     // no more subscribers left - remove from parent
                     this._connectionState.removeOnChangeNotification(this._type, this._sendHandler);

src/Documents/Session/InMemoryDocumentSessionOperations.ts

@@ -460,7 +460,7 @@ export abstract class InMemoryDocumentSessionOperations
                     hasAll = hasAll && this.isLoaded(includeId);
                 });
 
-                if (!hasAll[0]) {
+                if (!hasAll) {
                     return false;
                 }
             }

test/Ported/Cluster/ClusterModesForRequestExecutorTest.ts

@@ -1,4 +1,4 @@
-import { ClusterTestContext } from "../../Utils/TestUtil";
+import { ClusterTestContext, RavenTestContext } from "../../Utils/TestUtil";
 import { DocumentStore } from "../../../src/Documents/DocumentStore";
 import { DocumentConventions } from "../../../src/Documents/Conventions/DocumentConventions";
 import { ServerNode } from "../../../src/Http/ServerNode";
@@ -13,7 +13,7 @@ import { GetStatisticsOperation } from "../../../src/Documents/Operations/GetSta
 import { SessionInfo } from "../../../src/Documents/Session/IDocumentSession";
 import { UpdateTopologyParameters } from "../../../src/Http/UpdateTopologyParameters";
 
-describe("ClusterModesForRequestExecutorTest", function () {
+(RavenTestContext.isPullRequest ? describe.skip : describe)("ClusterModesForRequestExecutorTest", function () {
 
     let testContext: ClusterTestContext;
 

test/Ported/Cluster/ClusterOperationTest.ts

@@ -1,4 +1,4 @@
-import { ClusterTestContext } from "../../Utils/TestUtil";
+import { ClusterTestContext, RavenTestContext } from "../../Utils/TestUtil";
 import { DocumentStore } from "../../../src/Documents/DocumentStore";
 import { NextIdentityForOperation } from "../../../src/Documents/Operations/Identities/NextIdentityForOperation";
 import { assertThat, assertThrows } from "../../Utils/AssertExtensions";
@@ -13,7 +13,7 @@ import { GetDatabaseRecordOperation } from "../../../src/ServerWide/Operations/G
 import { ReorderDatabaseMembersOperation } from "../../../src/ServerWide/Operations/ReorderDatabaseMembersOperation";
 import { TypeUtil } from "../../../src/Utility/TypeUtil";
 
-describe("ClusterOperationTest", function () {
+(RavenTestContext.isPullRequest ? describe.skip : describe)("ClusterOperationTest", function () {
 
     const testContext = new ClusterTestContext();
 

test/Ported/Issues/RDBC_435.ts

@@ -0,0 +1,78 @@
+import { testContext, disposeTestDocumentStore } from "../../Utils/TestUtil";
+
+import {
+    IDocumentStore, DocumentChange,
+} from "../../../src";
+import { User } from "../../Assets/Entities";
+import { AsyncQueue } from "../../Utils/AsyncQueue";
+import { throwError } from "../../../src/Exceptions";
+import { assertThat, assertThrows } from "../../Utils/AssertExtensions";
+
+describe("RDBC_435", function () {
+
+    let store: IDocumentStore;
+
+    beforeEach(async function () {
+        store = await testContext.getDocumentStore();
+    });
+
+    afterEach(async () =>
+        await disposeTestDocumentStore(store));
+
+    it("can handle data/errors on/off", async () => {
+
+        const createUser = async () => {
+            const session = store.openSession();
+            const user1 = new User();
+            user1.age = 5;
+            await session.store(user1);
+            await session.saveChanges();
+
+            return user1.id;
+        }
+
+        const changesList = new AsyncQueue<DocumentChange>();
+
+        const changes = store.changes();
+        await changes.ensureConnectedNow();
+
+        const observable = changes.forDocumentsInCollection("users");
+        await observable.ensureSubscribedNow();
+
+        const handler = (change: DocumentChange) => changesList.push(change);
+
+        const errorHandler = e => throwError("InvalidOperationException", e.message);
+
+        observable.on("data", handler);
+        observable.on("error", errorHandler);
+
+        const user1Id = await createUser();
+
+        const change1 = await changesList.poll(15_000);
+        assertThat(change1)
+            .isNotNull();
+        assertThat(change1.id)
+            .isEqualTo(user1Id);
+
+        // now disable error handler, create next user and wait for change
+        observable.off("error", errorHandler);
+
+        const user2Id = await createUser();
+
+        const change2 = await changesList.poll(15_000);
+        assertThat(change2)
+            .isNotNull();
+        assertThat(change2.id)
+            .isEqualTo(user2Id);
+
+        // disable data handle - not we shouldn't get any data
+
+        observable.off("data", handler);
+        await createUser();
+
+        await assertThrows(async () => changesList.poll(3_000), err => {
+            assertThat(err.name)
+                .isEqualTo("TimeoutException");
+        });
+    });
+});

test/Ported/Issues/RDBC_440.ts

@@ -0,0 +1,32 @@
+import { IDocumentStore } from "../../../src";
+import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { User } from "../../Assets/Entities";
+import { assertThat } from "../../Utils/AssertExtensions";
+
+describe("RDBC_440", function () {
+
+    let store: IDocumentStore;
+
+    beforeEach(async function () {
+        store = await testContext.getDocumentStore();
+    });
+
+    afterEach(async () =>
+        await disposeTestDocumentStore(store));
+
+    it("can load just added entity", async () => {
+        const session = store.openSession();
+        const user1 = Object.assign(new User(), {
+            name: "Marcin",
+            id: "users/1"
+        });
+
+        await session.store(user1);
+        const loadedUser = await session
+            .include("addressId")
+            .load("users/1")
+
+        assertThat(loadedUser)
+            .isSameAs(user1);
+    });
+});

test/Ported/RequestExecutor.ts

@@ -1,13 +1,13 @@
 import { DocumentStore, EntityToJson, IDocumentStore, PutDocumentCommand } from "../../src";
-import { ClusterTestContext, disposeTestDocumentStore, testContext } from "../Utils/TestUtil";
+import { ClusterTestContext, disposeTestDocumentStore, RavenTestContext, testContext } from "../Utils/TestUtil";
 import { throwError } from "../../src/Exceptions";
 import { HttpRequestParameters, HttpResponse } from "../../src/Primitives/Http";
 import * as stream from "readable-stream";
 import * as http from "http";
 import { User } from "../Assets/Entities";
 import { assertThat } from "../Utils/AssertExtensions";
 
-describe("RequestExecutor", function () {
+(RavenTestContext.isPullRequest ? describe.skip : describe)("RequestExecutor", function () {
 
     let store: IDocumentStore;
 

test/Ported/Server/Replication/ReplicationWriteAssuranceTest.ts

@@ -1,9 +1,9 @@
-import { ClusterTestContext } from "../../../Utils/TestUtil";
+import { ClusterTestContext, RavenTestContext } from "../../../Utils/TestUtil";
 import { DocumentStore } from "../../../../src/Documents/DocumentStore";
 import { User } from "../../../Assets/Entities";
 import { assertThat } from "../../../Utils/AssertExtensions";
 
-describe("ReplicationWriteAssuranceTest", function () {
+(RavenTestContext.isPullRequest ? describe.skip : describe)("ReplicationWriteAssuranceTest", function () {
 
     const testContext = new ClusterTestContext();