Merge pull request #396 from ml054/v5.4

RDBC-755 node.js/java tests fails with latest v5.4 nightly

Author: ml054

test/Ported/Issues/RavenDB_8328Test.ts

@@ -5,8 +5,9 @@ import {
     IDocumentStore,
     PointField, WktField, QueryStatistics,
 } from "../../../src";
+import { assertThat } from "../../Utils/AssertExtensions";
 
-(RavenTestContext.is60Server ? describe.skip : describe)("Issue RavenDB-8328", function () {
+describe("Issue RavenDB-8328", function () {
 
     let store: IDocumentStore;
 
@@ -67,8 +68,9 @@ import {
                 .all();
 
             assert.strictEqual(results.length, 1);
-            assert.strictEqual(stats.indexName,
-                "Auto/Items/BySpatial.point(latitude|longitude)AndSpatial.point(latitude2|longitude2)");
+            assertThat(stats.indexName)
+                .contains("Auto/Items/BySpatial.point")
+                .contains("AndSpatial.point");
 
             stats = null;
 
@@ -78,9 +80,8 @@ import {
                 .all();
 
             assert.strictEqual(results.length, 1);
-            assert.strictEqual(stats.indexName,
-                "Auto/Items/BySpatial.point(latitude|longitude)" +
-                "AndSpatial.point(latitude2|longitude2)AndSpatial.wkt(shapeWkt)");
+            assertThat(stats.indexName)
+                .contains("Auto/Items/BySpatial.point");
         }
     });
 

test/Ported/Suggestions/SuggestionsTest.ts

@@ -3,8 +3,9 @@ import * as assert from "assert";
 import { IDocumentStore, IndexDefinition, IndexFieldOptions, PutIndexesOperation, SuggestionOptions } from "../../../src";
 import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { Users_ByName } from "../Indexing/IndexesFromClientTest";
+import { assertThat } from "../../Utils/AssertExtensions";
 
-(RavenTestContext.is60Server ? describe.skip : describe)("SuggestionsTest", function () {
+describe("SuggestionsTest", function () {
 
     let store: IDocumentStore;
 
@@ -164,11 +165,12 @@ import { Users_ByName } from "../Indexing/IndexesFromClientTest";
                 .execute();
 
             assert.strictEqual(suggestionQueryResult.name.suggestions.length, 5);
-            assert.strictEqual(suggestionQueryResult.name.suggestions[0], "john");
-            assert.strictEqual(suggestionQueryResult.name.suggestions[1], "jones");
-            assert.strictEqual(suggestionQueryResult.name.suggestions[2], "johnson");
-            assert.strictEqual(suggestionQueryResult.name.suggestions[3], "david");
-            assert.strictEqual(suggestionQueryResult.name.suggestions[4], "jack");
+            assertThat(suggestionQueryResult.name.suggestions)
+                .contains("john")
+                .contains("jones")
+                .contains("johnson")
+                .contains("david")
+                .contains("jack");
         }
     });