Skip to content

Commit 58db520

Browse files
SvBeGerrit Code Review
SvBe
authored and
Gerrit Code Review
committed
Merge "[INTERNAL] sap.ui.core.qunit.(TestUtils|util.SyncPromise|odata.v4.*): Unify assertions for unexpected success handler calls of Promises"
2 parents 110b6a3 + e8e7772 commit 58db520

16 files changed

+157
-157
lines changed

‎src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/Context.qunit.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ sap.ui.define([
14701470

14711471
// code under test
14721472
return oContext.delete(sGroupId, "~bDoNotRequestCount~").then(function () {
1473-
assert.notOk(true);
1473+
assert.ok(false, "Unexpected success");
14741474
}, function (oError) {
14751475
assert.strictEqual(oError, "~oError~");
14761476
});
@@ -1506,7 +1506,7 @@ sap.ui.define([
15061506

15071507
// code under test
15081508
return oContext.delete("myGroup", "~bDoNotRequestCount~").then(function () {
1509-
assert.notOk(true);
1509+
assert.ok(false, "Unexpected success");
15101510
}, function (oError) {
15111511
assert.strictEqual(oError, "~oError~");
15121512
});
@@ -2539,7 +2539,7 @@ sap.ui.define([
25392539

25402540
assert.ok(oPromise instanceof Promise);
25412541
return oPromise.then(function () {
2542-
assert.ok(false, "unexpected success");
2542+
assert.ok(false, "Unexpected success");
25432543
}, function (vError) {
25442544
assert.strictEqual(vError, "~error~");
25452545
});
@@ -2995,7 +2995,7 @@ sap.ui.define([
29952995
assert.ok(oResult instanceof Promise);
29962996

29972997
return oResult.then(function () {
2998-
assert.ok(false, "unexpected success");
2998+
assert.ok(false, "Unexpected success");
29992999
}, function (oError0) {
30003000
assert.strictEqual(oError0, oError);
30013001
});
@@ -4335,7 +4335,7 @@ sap.ui.define([
43354335
oGroupLockMock.expects("unlock").withExactArgs(true);
43364336

43374337
return oPromise.then(function () {
4338-
oPromise.ok(false, "unexpected success");
4338+
assert.ok(false, "Unexpected success");
43394339
}, function (oError0) {
43404340
assert.strictEqual(oError0, oError);
43414341
});
@@ -4372,7 +4372,7 @@ sap.ui.define([
43724372
// code under test
43734373
return oContext.setProperty("some/relative/path", "new value", null)
43744374
.then(function () {
4375-
assert.ok(false);
4375+
assert.ok(false, "Unexpected success");
43764376
}, function (oError0) {
43774377
assert.strictEqual(oError0, oError);
43784378

‎src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataBinding.qunit.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ sap.ui.define([
350350

351351
// code under test
352352
return oBinding.requestRefresh("groupId").then(function () {
353-
assert.ok(false);
353+
assert.ok(false, "Unexpected success");
354354
}, function (oResultingError) {
355355
assert.strictEqual(oResultingError, oError);
356356
});
@@ -785,7 +785,7 @@ sap.ui.define([
785785

786786
// code under test
787787
oBinding.fetchOrGetQueryOptionsForOwnCache(oContext).then(function () {
788-
assert.ok(false, "unexpected success");
788+
assert.ok(false, "Unexpected success");
789789
}, function (oError0) {
790790
assert.strictEqual(oError0, oError);
791791
});
@@ -1567,7 +1567,7 @@ sap.ui.define([
15671567

15681568
return oBinding.oCachePromise.then(
15691569
function () {
1570-
assert.ok(false, "unexpected success");
1570+
assert.ok(false, "Unexpected success");
15711571
},
15721572
function (oError0) {
15731573
assert.strictEqual(oError0, oError);
@@ -3189,7 +3189,7 @@ sap.ui.define([
31893189

31903190
try {
31913191
oBinding.checkSameCache(oCache);
3192-
assert.ok(false);
3192+
assert.ok(false, "Unexpected success");
31933193
} catch (oError) {
31943194
assert.strictEqual(oError.message,
31953195
oBinding + " is ignoring response from inactive cache: unexpected");
@@ -3198,7 +3198,7 @@ sap.ui.define([
31983198

31993199
try {
32003200
oBinding.checkSameCache(oBinding.oCache, 23);
3201-
assert.ok(false);
3201+
assert.ok(false, "Unexpected success");
32023202
} catch (oError) {
32033203
assert.strictEqual(oError.message,
32043204
oBinding + " is ignoring response from inactive cache: actual");

‎src/sap.ui.core/test/sap/ui/core/qunit/odata/v4/ODataContextBinding.qunit.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ sap.ui.define([
695695

696696
// invoke read before refresh
697697
oPromise = oBinding.fetchValue("/EMPLOYEES(ID='1')/ID").then(function () {
698-
assert.ok(false, "First read has to be canceled");
698+
assert.ok(false, "Unexpected success"); // first read has to be canceled
699699
}, function (oError1) {
700700
assert.strictEqual(oError1.canceled, true);
701701
// no Error is logged because error has canceled flag
@@ -825,12 +825,12 @@ sap.ui.define([
825825
"Failed to read path /absolute", sClassName, sinon.match.same(oExpectedError));
826826

827827
oBinding.fetchValue("/absolute/foo").then(function () {
828-
assert.ok(false, "unexpected success");
828+
assert.ok(false, "Unexpected success");
829829
}, function (oError) {
830830
assert.strictEqual(oError, oExpectedError);
831831
});
832832
return oBinding.fetchValue("/absolute/bar").then(function () {
833-
assert.ok(false, "unexpected success");
833+
assert.ok(false, "Unexpected success");
834834
}, function (oError) {
835835
assert.strictEqual(oError, oExpectedError);
836836
});
@@ -873,7 +873,7 @@ sap.ui.define([
873873
"Failed to read path ~", sClassName, sinon.match.same(oError));
874874

875875
return oBinding.fetchValue("/Base/relative/foo").then(function () {
876-
assert.ok(false, "unexpected success");
876+
assert.ok(false, "Unexpected success");
877877
}, function (oResult) {
878878
assert.strictEqual(oResult, oError);
879879
});
@@ -1475,7 +1475,7 @@ sap.ui.define([
14751475

14761476
return oBinding._invoke(oGroupLock) // code under test
14771477
.then(function () {
1478-
assert.ok(false);
1478+
assert.ok(false, "Unexpected success");
14791479
}, function (oError) {
14801480
assert.strictEqual(oError.message, oFixture.error);
14811481
});
@@ -1816,7 +1816,7 @@ sap.ui.define([
18161816
// code under test
18171817
return oBinding._invoke(oGroupLock, "~mParameters~", "~bIgnoreETag~")
18181818
.then(function () {
1819-
assert.ok(false, "unexpected success");
1819+
assert.ok(false, "Unexpected success");
18201820
}, function (oError0) {
18211821
assert.strictEqual(oError0, oError);
18221822
});
@@ -1926,7 +1926,7 @@ sap.ui.define([
19261926
return oBinding._invoke(oGroupLock, "~mParameters~", "~bIgnoreETag~",
19271927
"~fnOnStrictHandlingFailed~", /*bReplaceWithRVC*/true)
19281928
.then(function () {
1929-
assert.ok(false);
1929+
assert.ok(false, "Unexpected success");
19301930
}, function (oError0) {
19311931
assert.strictEqual(oError0, oError);
19321932
assert.strictEqual(oReportErrorExpectation.args[0][2], oError);
@@ -1971,7 +1971,7 @@ sap.ui.define([
19711971

19721972
// code under test
19731973
return oBinding._invoke(oGroupLock, "~mParameters~", "~bIgnoreETag~").then(function () {
1974-
assert.ok(false);
1974+
assert.ok(false, "Unexpected success");
19751975
}, function (oError0) {
19761976
assert.strictEqual(oError0, oError);
19771977
assert.strictEqual(bDependentsRefreshed, true);
@@ -2007,7 +2007,7 @@ sap.ui.define([
20072007

20082008
// code under test
20092009
return oBinding._invoke(oGroupLock, "~mParameters~", "~bIgnoreETag~").then(function () {
2010-
assert.ok(false);
2010+
assert.ok(false, "Unexpected success");
20112011
}, function (oError0) {
20122012
assert.strictEqual(oError0, oError);
20132013
});
@@ -2065,7 +2065,7 @@ sap.ui.define([
20652065

20662066
// code under test
20672067
return oBinding._invoke(oGroupLock, "~mParameters~", "~bIgnoreETag~").then(function () {
2068-
assert.ok(false);
2068+
assert.ok(false, "Unexpected success");
20692069
}, function (oError0) {
20702070
assert.strictEqual(oError0, oError);
20712071
});
@@ -2120,7 +2120,7 @@ sap.ui.define([
21202120

21212121
// code under test
21222122
return oBinding._invoke(oGroupLock, "~mParameters~", "~bIgnoreETag~").then(function () {
2123-
assert.ok(false);
2123+
assert.ok(false, "Unexpected success");
21242124
}, function (oError0) {
21252125
assert.strictEqual(oError0, oError);
21262126
});
@@ -3746,7 +3746,7 @@ sap.ui.define([
37463746
// code under test
37473747
return oBinding.refreshInternal("path", "myGroup", false, bKeepCacheOnError)
37483748
.then(function () {
3749-
assert.ok(false);
3749+
assert.ok(false, "Unexpected success");
37503750
}, function (oReturnedError) {
37513751
assert.strictEqual(oReturnedError, oError);
37523752
if (bKeepCacheOnError) {
@@ -3814,13 +3814,13 @@ sap.ui.define([
38143814
// code under test
38153815
oRefreshPromise1 = oBinding.refreshInternal("path", "myGroup", true, bKeepCacheOnError)
38163816
.then(function () {
3817-
assert.ok(false);
3817+
assert.ok(false, "Unexpected success");
38183818
}, function (oReturnedError) {
38193819
assert.strictEqual(oReturnedError, oError);
38203820
});
38213821
oRefreshPromise2 = oBinding.refreshInternal("path", "myGroup", true, bKeepCacheOnError)
38223822
.then(function () {
3823-
assert.ok(false);
3823+
assert.ok(false, "Unexpected success");
38243824
}, function (oReturnedError) {
38253825
assert.strictEqual(oReturnedError, oError);
38263826
});
@@ -3892,7 +3892,7 @@ sap.ui.define([
38923892

38933893
// code under test
38943894
return oBinding.refreshInternal("path", "myGroup", false, true).then(function () {
3895-
assert.ok(false);
3895+
assert.ok(false, "Unexpected success");
38963896
}, function (oReturnedError) {
38973897
assert.strictEqual(oReturnedError,
38983898
bFetchResourcePathFails ? oYetAnotherError : oError);
@@ -3949,7 +3949,7 @@ sap.ui.define([
39493949

39503950
// code under test
39513951
return oBinding.refreshInternal("path", "myGroup", true, true).then(function () {
3952-
assert.ok(false);
3952+
assert.ok(false, "Unexpected success");
39533953
}, function (oReturnedError) {
39543954
assert.strictEqual(oReturnedError, oYetAnotherError);
39553955
assert.strictEqual(oBinding.oCache, oOldCache);
@@ -4813,7 +4813,7 @@ sap.ui.define([
48134813
// code under test
48144814
return oBinding.refreshReturnValueContext(oReturnValueContext, "group", bKeepCacheOnError)
48154815
.then(function () {
4816-
assert.ok(false, "unexpected success");
4816+
assert.ok(false, "Unexpected success");
48174817
}, function (oError0) {
48184818
assert.strictEqual(oError0,
48194819
bKeepCacheOnError && bCheckFails ? oCheckError : oError);
@@ -4965,7 +4965,7 @@ sap.ui.define([
49654965

49664966
// code under test
49674967
return oBinding.requestSideEffects(sGroupId, aPaths, oContext).then(function () {
4968-
assert.ok(false, "unexpected success");
4968+
assert.ok(false, "Unexpected success");
49694969
}, function (oError0) {
49704970
assert.strictEqual(oError0, oError);
49714971
});

0 commit comments

Comments
 (0)