Skip to content

Commit 468e9b6

Browse files
committed
Renamed assertionMessage to messageAtLastKnownMarker in fourslash
1 parent 8a650bf commit 468e9b6

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/harness/fourslash.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -413,11 +413,11 @@ module FourSlash {
413413
}
414414

415415
private raiseError(message: string) {
416-
message = this.assertionMessage(message);
416+
message = this.messageAtLastKnownMarker(message);
417417
throw new Error(message);
418418
}
419419

420-
private assertionMessage(message: string) {
420+
private messageAtLastKnownMarker(message: string) {
421421
return "Marker: " + currentTestState.lastKnownMarker + "\n" + message;
422422
}
423423

@@ -778,29 +778,29 @@ module FourSlash {
778778

779779
if (negative) {
780780
if (expectedTypeName !== undefined) {
781-
assert.notEqual(actualQuickInfoMemberName, expectedTypeName, this.assertionMessage("quick info member name"));
781+
assert.notEqual(actualQuickInfoMemberName, expectedTypeName, this.messageAtLastKnownMarker("quick info member name"));
782782
}
783783
if (docComment != undefined) {
784-
assert.notEqual(actualQuickInfoDocComment, docComment, this.assertionMessage("quick info doc comment"));
784+
assert.notEqual(actualQuickInfoDocComment, docComment, this.messageAtLastKnownMarker("quick info doc comment"));
785785
}
786786
if (symbolName !== undefined) {
787-
assert.notEqual(actualQuickInfoSymbolName, symbolName, this.assertionMessage("quick info symbol name"));
787+
assert.notEqual(actualQuickInfoSymbolName, symbolName, this.messageAtLastKnownMarker("quick info symbol name"));
788788
}
789789
if (kind !== undefined) {
790-
assert.notEqual(actualQuickInfoKind, kind, this.assertionMessage("quick info kind"));
790+
assert.notEqual(actualQuickInfoKind, kind, this.messageAtLastKnownMarker("quick info kind"));
791791
}
792792
} else {
793793
if (expectedTypeName !== undefined) {
794-
assert.equal(actualQuickInfoMemberName, expectedTypeName, this.assertionMessage("quick info member"));
794+
assert.equal(actualQuickInfoMemberName, expectedTypeName, this.messageAtLastKnownMarker("quick info member"));
795795
}
796796
if (docComment != undefined) {
797-
assert.equal(actualQuickInfoDocComment, docComment, this.assertionMessage("quick info doc"));
797+
assert.equal(actualQuickInfoDocComment, docComment, this.messageAtLastKnownMarker("quick info doc"));
798798
}
799799
if (symbolName !== undefined) {
800-
assert.equal(actualQuickInfoSymbolName, symbolName, this.assertionMessage("quick info symbol name"));
800+
assert.equal(actualQuickInfoSymbolName, symbolName, this.messageAtLastKnownMarker("quick info symbol name"));
801801
}
802802
if (kind !== undefined) {
803-
assert.equal(actualQuickInfoKind, kind, this.assertionMessage("quick info kind"));
803+
assert.equal(actualQuickInfoKind, kind, this.messageAtLastKnownMarker("quick info kind"));
804804
}
805805
}
806806
}
@@ -1455,11 +1455,11 @@ module FourSlash {
14551455
var actualDefinitionName = definitions && definitions.length ? definitions[0].name : "";
14561456
var actualDefinitionContainerName = definitions && definitions.length ? definitions[0].containerName : "";
14571457
if (negative) {
1458-
assert.notEqual(actualDefinitionName, expectedName, this.assertionMessage("Definition Info Name"));
1459-
assert.notEqual(actualDefinitionName, expectedName, this.assertionMessage("Definition Info Container Name"));
1458+
assert.notEqual(actualDefinitionName, expectedName, this.messageAtLastKnownMarker("Definition Info Name"));
1459+
assert.notEqual(actualDefinitionName, expectedName, this.messageAtLastKnownMarker("Definition Info Container Name"));
14601460
} else {
1461-
assert.equal(actualDefinitionName, expectedName, this.assertionMessage("Definition Info Name"));
1462-
assert.equal(actualDefinitionName, expectedName, this.assertionMessage("Definition Info Container Name"));
1461+
assert.equal(actualDefinitionName, expectedName, this.messageAtLastKnownMarker("Definition Info Name"));
1462+
assert.equal(actualDefinitionName, expectedName, this.messageAtLastKnownMarker("Definition Info Container Name"));
14631463
}
14641464
}
14651465

0 commit comments

Comments
 (0)