Skip to content

Commit 54c89dd

Browse files
thiemowmdethiemowmde
committed
Merge pull request #36 from wmde/assertExpect
Add assert.expect calls to all QUnit tests
2 parents 0ddc5d9 + 4ae6d57 commit 54c89dd

27 files changed

+103
-4
lines changed

‎.jshintignore

Whitespace-only changes.

‎tests/Claim.tests.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
QUnit.module( 'wikibase.datamodel.Claim' );
99

1010
QUnit.test( 'Constructor', function( assert ) {
11+
assert.expect( 7 );
1112
var argumentLists = [
1213
{
1314
mainSnak: new wb.datamodel.PropertyNoValueSnak( 'p1' )
@@ -51,6 +52,7 @@ QUnit.test( 'Constructor', function( assert ) {
5152
} );
5253

5354
QUnit.test( 'setMainSnak() & getMainSnak()', function( assert ) {
55+
assert.expect( 1 );
5456
var claim = new wb.datamodel.Claim( new wb.datamodel.PropertyNoValueSnak( 'p1' ) ),
5557
snak = new wb.datamodel.PropertyNoValueSnak( 'p2' );
5658

@@ -63,6 +65,7 @@ QUnit.test( 'setMainSnak() & getMainSnak()', function( assert ) {
6365
} );
6466

6567
QUnit.test( 'setQualifiers() & getQualifiers()', function( assert ) {
68+
assert.expect( 2 );
6669
var claim = new wb.datamodel.Claim( new wb.datamodel.PropertyNoValueSnak( 'p1' ) ),
6770
qualifiers = new wb.datamodel.SnakList( [
6871
new wb.datamodel.PropertyNoValueSnak( 'p10' ),
@@ -87,6 +90,7 @@ QUnit.test( 'setQualifiers() & getQualifiers()', function( assert ) {
8790
} );
8891

8992
QUnit.test( 'equals()', function( assert ) {
93+
assert.expect( 17 );
9094
var claims = [
9195
new wb.datamodel.Claim( new wb.datamodel.PropertyNoValueSnak( 'p1' ) ),
9296
new wb.datamodel.Claim( new wb.datamodel.PropertySomeValueSnak( 'p1' ) ),

‎tests/ClaimGroup.tests.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ var testSets = [
1818
];
1919

2020
QUnit.test( 'Constructor', function( assert ) {
21+
assert.expect( 2 );
2122
for( var i = 0; i < testSets.length; i++ ) {
2223
var claimGroup = new wb.datamodel.ClaimGroup( testSets[i][0], testSets[i][1] );
2324

‎tests/ClaimGroupSet.tests.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var testSets = [
2020
];
2121

2222
QUnit.test( 'Constructor', function( assert ) {
23+
assert.expect( 2 );
2324
for( var i = 0; i < testSets.length; i++ ) {
2425
var claimGroupSet = new wb.datamodel.ClaimGroupSet( testSets[i] );
2526

‎tests/ClaimList.tests.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ var testSets = [
1717
];
1818

1919
QUnit.test( 'Constructor', function( assert ) {
20+
assert.expect( 2 );
2021
for( var i = 0; i < testSets.length; i++ ) {
2122
assert.ok(
2223
( new wb.datamodel.ClaimList( testSets[i] ) ) instanceof wb.datamodel.ClaimList,
@@ -26,6 +27,7 @@ QUnit.test( 'Constructor', function( assert ) {
2627
} );
2728

2829
QUnit.test( 'getPropertyIds()', function( assert ) {
30+
assert.expect( 2 );
2931
for( var i = 0; i < testSets.length; i++ ) {
3032
var expectedPropertyIds = [];
3133

‎tests/EntityId.tests.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ var testSets = [
1818
];
1919

2020
QUnit.test( 'Constructor and getters', function( assert ) {
21+
assert.expect( 12 );
2122
for( var i = 0; i < testSets.length; i++ ) {
2223
var entityId = new wb.datamodel.EntityId( testSets[i][0], testSets[i][1] );
2324

@@ -58,6 +59,7 @@ QUnit.test( 'Constructor and getters', function( assert ) {
5859
} );
5960

6061
QUnit.test( 'equals()', function( assert ) {
62+
assert.expect( 4 );
6163
for( var i = 0; i < testSets.length; i++ ) {
6264
var entityId1 = new wb.datamodel.EntityId( testSets[i][0], testSets[i][1] );
6365

@@ -81,6 +83,7 @@ QUnit.test( 'equals()', function( assert ) {
8183
} );
8284

8385
QUnit.test( 'toJSON() & newFromJSON()', function( assert ) {
86+
assert.expect( 2 );
8487
for( var i = 0; i < testSets.length; i++ ) {
8588
var entityId = new wb.datamodel.EntityId( testSets[i][0], testSets[i][1] ),
8689
json = entityId.toJSON();

‎tests/Fingerprint.tests.js

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ var testSets = [
2929
];
3030

3131
QUnit.test( 'Constructor (positive)', function( assert ) {
32+
assert.expect( 26 );
33+
var i, fingerprint;
3234

3335
/**
3436
* @param {Object} assert
@@ -71,8 +73,8 @@ QUnit.test( 'Constructor (positive)', function( assert ) {
7173
}
7274
}
7375

74-
for( var i = 0; i < testSets.length; i++ ) {
75-
var fingerprint = new wb.datamodel.Fingerprint(
76+
for( i = 0; i < testSets.length; i++ ) {
77+
fingerprint = new wb.datamodel.Fingerprint(
7678
testSets[i][0], testSets[i][1], testSets[i][2]
7779
);
7880

@@ -94,6 +96,7 @@ QUnit.test( 'Constructor (positive)', function( assert ) {
9496
} );
9597

9698
QUnit.test( 'Constructor (negative)', function( assert ) {
99+
assert.expect( 3 );
97100
var negativeTestSets = [
98101
['string', new wb.datamodel.TermMap(), new wb.datamodel.MultiTermMap()],
99102
[new wb.datamodel.TermMap(), 'string', new wb.datamodel.MultiTermMap()],
@@ -123,6 +126,7 @@ QUnit.test( 'Constructor (negative)', function( assert ) {
123126
} );
124127

125128
QUnit.test( 'setLabel()', function( assert ) {
129+
assert.expect( 3 );
126130
var fingerprint = new wb.datamodel.Fingerprint(),
127131
label = new wb.datamodel.Term( 'de', 'de-label' );
128132

@@ -147,6 +151,7 @@ QUnit.test( 'setLabel()', function( assert ) {
147151
} );
148152

149153
QUnit.test( 'removeLabel()', function( assert ) {
154+
assert.expect( 3 );
150155
var label = new wb.datamodel.Term( 'de', 'de-label' ),
151156
fingerprint = new wb.datamodel.Fingerprint( new wb.datamodel.TermMap( { de: label } ) );
152157

@@ -171,6 +176,7 @@ QUnit.test( 'removeLabel()', function( assert ) {
171176
} );
172177

173178
QUnit.test( 'removeLabelFor()', function( assert ) {
179+
assert.expect( 2 );
174180
var label = new wb.datamodel.Term( 'de', 'de-label' ),
175181
fingerprint = new wb.datamodel.Fingerprint( new wb.datamodel.TermMap( { de: label } ) );
176182

@@ -188,6 +194,7 @@ QUnit.test( 'removeLabelFor()', function( assert ) {
188194
} );
189195

190196
QUnit.test( 'setDescription()', function( assert ) {
197+
assert.expect( 3 );
191198
var fingerprint = new wb.datamodel.Fingerprint(),
192199
description = new wb.datamodel.Term( 'de', 'de-description' );
193200

@@ -212,6 +219,7 @@ QUnit.test( 'setDescription()', function( assert ) {
212219
} );
213220

214221
QUnit.test( 'removeDescription()', function( assert ) {
222+
assert.expect( 3 );
215223
var description = new wb.datamodel.Term( 'de', 'de-description' ),
216224
fingerprint = new wb.datamodel.Fingerprint(
217225
null,
@@ -239,6 +247,7 @@ QUnit.test( 'removeDescription()', function( assert ) {
239247
} );
240248

241249
QUnit.test( 'removeDescriptionFor()', function( assert ) {
250+
assert.expect( 2 );
242251
var description = new wb.datamodel.Term( 'de', 'de-description' ),
243252
fingerprint = new wb.datamodel.Fingerprint(
244253
null,
@@ -259,6 +268,7 @@ QUnit.test( 'removeDescriptionFor()', function( assert ) {
259268
} );
260269

261270
QUnit.test( 'setAliases()', function( assert ) {
271+
assert.expect( 6 );
262272
var fingerprint = new wb.datamodel.Fingerprint(),
263273
deAliases = new wb.datamodel.MultiTerm( 'de', ['de-alias'] ),
264274
enAliases = new wb.datamodel.MultiTerm( 'en', ['en-alias'] ),
@@ -304,6 +314,7 @@ QUnit.test( 'setAliases()', function( assert ) {
304314
} );
305315

306316
QUnit.test( 'removeAliases()', function( assert ) {
317+
assert.expect( 3 );
307318
var aliases = new wb.datamodel.MultiTerm( 'de', ['de-alias'] ),
308319
fingerprint = new wb.datamodel.Fingerprint(
309320
null,
@@ -332,6 +343,7 @@ QUnit.test( 'removeAliases()', function( assert ) {
332343
} );
333344

334345
QUnit.test( 'removeAliasesFor()', function( assert ) {
346+
assert.expect( 2 );
335347
var aliases = new wb.datamodel.MultiTerm( 'de', ['de-alias'] ),
336348
fingerprint = new wb.datamodel.Fingerprint(
337349
null,
@@ -353,6 +365,7 @@ QUnit.test( 'removeAliasesFor()', function( assert ) {
353365
} );
354366

355367
QUnit.test( 'isEmpty()', function( assert ) {
368+
assert.expect( 4 );
356369
assert.ok(
357370
( new wb.datamodel.Fingerprint(
358371
new wb.datamodel.TermMap(),
@@ -393,6 +406,7 @@ QUnit.test( 'isEmpty()', function( assert ) {
393406
} );
394407

395408
QUnit.test( 'equals()', function( assert ) {
409+
assert.expect( 4 );
396410
for( var i = 0; i < testSets.length; i++ ) {
397411
var fingerprint1 = new wb.datamodel.Fingerprint(
398412
testSets[i][0], testSets[i][1], testSets[i][2]

‎tests/Group.tests.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ function createGroup( key, container ) {
128128
}
129129

130130
QUnit.test( 'Constructor', function( assert ) {
131+
assert.expect( 6 );
131132
assert.ok(
132133
createGroup( 'key', new TestContainer() ) instanceof wb.datamodel.Group,
133134
'Instantiated empty Group.'
@@ -168,6 +169,7 @@ QUnit.test( 'Constructor', function( assert ) {
168169
} );
169170

170171
QUnit.test( 'setItemContainer() & getItemContainer()', function( assert ) {
172+
assert.expect( 6 );
171173
var container = getTestContainer( 'key', 1 ),
172174
group = createGroup( 'key', container ),
173175
newContainer = getTestContainer( 'key', 3 );
@@ -210,6 +212,7 @@ QUnit.test( 'setItemContainer() & getItemContainer()', function( assert ) {
210212
} );
211213

212214
QUnit.test( 'addItem() & hasItem()', function( assert ) {
215+
assert.expect( 3 );
213216
var container = getTestContainer( 'key', 1 ),
214217
group = createGroup( 'key', container ),
215218
newItem = getTestItems( 'key', 2 )[1];
@@ -235,6 +238,7 @@ QUnit.test( 'addItem() & hasItem()', function( assert ) {
235238
} );
236239

237240
QUnit.test( 'equals()', function( assert ) {
241+
assert.expect( 2 );
238242
var group = createGroup( 'key', getTestContainer( 'key', 1 ) );
239243

240244
assert.ok(

‎tests/Item.tests.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ var testSets = [
4242
];
4343

4444
QUnit.test( 'Constructor', function( assert ) {
45+
assert.expect( 2 );
4546
for( var i = 0; i < testSets.length; i++ ) {
4647
var item = new wb.datamodel.Item(
4748
testSets[i][0], testSets[i][1], testSets[i][2], testSets[i][3]
@@ -54,6 +55,7 @@ QUnit.test( 'Constructor', function( assert ) {
5455
} );
5556

5657
QUnit.test( 'isEmpty()', function( assert ) {
58+
assert.expect( 4 );
5759
assert.ok(
5860
( new wb.datamodel.Item(
5961
'Q1',
@@ -118,6 +120,7 @@ QUnit.test( 'isEmpty()', function( assert ) {
118120
} );
119121

120122
QUnit.test( 'equals()', function( assert ) {
123+
assert.expect( 4 );
121124
for( var i = 0; i < testSets.length; i++ ) {
122125
var item1 = new wb.datamodel.Item(
123126
testSets[i][0], testSets[i][1], testSets[i][2], testSets[i][3]

‎tests/List.tests.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ function getTestItems( n ) {
3030
}
3131

3232
QUnit.test( 'Constructor', function( assert ) {
33+
assert.expect( 5 );
3334
assert.ok(
3435
( new wb.datamodel.List( TestItem ) ) instanceof wb.datamodel.List,
3536
'Instantiated empty List.'
@@ -64,6 +65,7 @@ QUnit.test( 'Constructor', function( assert ) {
6465
} );
6566

6667
QUnit.test( 'each()', function( assert ) {
68+
assert.expect( 2 );
6769
var items = getTestItems( 2 ),
6870
list = new wb.datamodel.List( TestItem, items );
6971

@@ -76,6 +78,7 @@ QUnit.test( 'each()', function( assert ) {
7678
} );
7779

7880
QUnit.test( 'hasItem()', function( assert ) {
81+
assert.expect( 2 );
7982
var items = getTestItems( 3 ),
8083
list = new wb.datamodel.List( TestItem, items );
8184

@@ -91,6 +94,7 @@ QUnit.test( 'hasItem()', function( assert ) {
9194
} );
9295

9396
QUnit.test( 'addItem() & length attribute', function( assert ) {
97+
assert.expect( 3 );
9498
var items = getTestItems( 3 ),
9599
newItems = getTestItems( 1 ),
96100
list = new wb.datamodel.List( TestItem, items );
@@ -116,6 +120,7 @@ QUnit.test( 'addItem() & length attribute', function( assert ) {
116120
} );
117121

118122
QUnit.test( 'removeItem()', function( assert ) {
123+
assert.expect( 4 );
119124
var items = getTestItems( 3 ),
120125
unsetItems = getTestItems( 1 ),
121126
list = new wb.datamodel.List( TestItem, items );
@@ -148,6 +153,7 @@ QUnit.test( 'removeItem()', function( assert ) {
148153
} );
149154

150155
QUnit.test( 'isEmpty()', function( assert ) {
156+
assert.expect( 3 );
151157
var items = getTestItems( 1 ),
152158
list = new wb.datamodel.List( TestItem );
153159

@@ -172,6 +178,7 @@ QUnit.test( 'isEmpty()', function( assert ) {
172178
} );
173179

174180
QUnit.test( 'equals()', function( assert ) {
181+
assert.expect( 2 );
175182
var items = getTestItems( 3 ),
176183
list = new wb.datamodel.List( TestItem, items );
177184

@@ -189,6 +196,7 @@ QUnit.test( 'equals()', function( assert ) {
189196
} );
190197

191198
QUnit.test( 'indexOf()', function( assert ) {
199+
assert.expect( 1 );
192200
var items = getTestItems( 3 ),
193201
list = new wb.datamodel.List( TestItem, items );
194202

0 commit comments

Comments
 (0)