Skip to content

Commit 9f75b0e

Browse files
authored
fix: test-rankOrder works on ava 3 or 4 (#6327)
1 parent 47f1dca commit 9f75b0e

File tree

1 file changed

+37
-32
lines changed

1 file changed

+37
-32
lines changed

packages/store/test/test-rankOrder.js

+37-32
Original file line numberDiff line numberDiff line change
@@ -115,39 +115,44 @@ test('compareRank is transitive', async t => {
115115
assertRankSorted(sorted, compareRank);
116116
const [a, b, c] = sorted;
117117
const failures = [];
118-
let result;
119-
let resultOk;
120118

121-
result = compareRank(a, b);
122-
resultOk = t.true(result <= 0, 'a <= b');
123-
if (!resultOk) {
124-
failures.push(`Expected <= 0: ${result} from ${q(a)} vs. ${q(b)}`);
125-
}
126-
result = compareRank(a, c);
127-
resultOk = t.true(result <= 0, 'a <= c');
128-
if (!resultOk) {
129-
failures.push(`Expected <= 0: ${result} from ${q(a)} vs. ${q(c)}`);
130-
}
131-
result = compareRank(b, c);
132-
resultOk = t.true(result <= 0, 'b <= c');
133-
if (!resultOk) {
134-
failures.push(`Expected <= 0: ${result} from ${q(b)} vs. ${q(c)}`);
135-
}
136-
result = compareRank(c, b);
137-
resultOk = t.true(result >= 0, 'c >= b');
138-
if (!resultOk) {
139-
failures.push(`Expected >= 0: ${result} from ${q(c)} vs. ${q(b)}`);
140-
}
141-
result = compareRank(c, a);
142-
resultOk = t.true(result >= 0, 'c >= a');
143-
if (!resultOk) {
144-
failures.push(`Expected >= 0: ${result} from ${q(c)} vs. ${q(a)}`);
145-
}
146-
result = compareRank(b, a);
147-
resultOk = t.true(result >= 0, 'b >= a');
148-
if (!resultOk) {
149-
failures.push(`Expected >= 0: ${result} from ${q(b)} vs. ${q(a)}`);
150-
}
119+
const testCompare = (outcome, message, failure) => {
120+
t.true(outcome, message);
121+
if (!outcome) {
122+
failures.push(failure);
123+
}
124+
};
125+
126+
testCompare(
127+
compareRank(a, b) <= 0,
128+
'a <= b',
129+
`Expected <= 0: ${q(a)} vs. ${q(b)}`,
130+
);
131+
testCompare(
132+
compareRank(a, c) <= 0,
133+
'a <= c',
134+
`Expected <= 0: ${q(a)} vs. ${q(c)}`,
135+
);
136+
testCompare(
137+
compareRank(b, c) <= 0,
138+
'b <= c',
139+
`Expected <= 0: ${q(b)} vs. ${q(c)}`,
140+
);
141+
testCompare(
142+
compareRank(c, b) >= 0,
143+
'c >= b',
144+
`Expected >= 0: ${q(c)} vs. ${q(b)}`,
145+
);
146+
testCompare(
147+
compareRank(c, a) >= 0,
148+
'c >= a',
149+
`Expected >= 0: ${q(c)} vs. ${q(a)}`,
150+
);
151+
testCompare(
152+
compareRank(b, a) >= 0,
153+
'b >= a',
154+
`Expected >= 0: ${q(b)} vs. ${q(a)}`,
155+
);
151156

152157
return t.deepEqual(failures, []);
153158
},

0 commit comments

Comments
 (0)