Skip to content

Commit bf00756

Browse files
jawshooahjawshooah
committed
Listen for errors in tests rather than asserting true
1 parent 936f5b8 commit bf00756

File tree

2 files changed

+196
-28
lines changed

2 files changed

+196
-28
lines changed

‎tests/css/CSSParserTests.htm

Lines changed: 77 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,32 +1376,62 @@ <h1>CSS Parser Tests</h1>
13761376

13771377
testWebKitKeyFrames: function(){
13781378
var parser = new Parser({strict:true});
1379+
var valid = true;
1380+
1381+
parser.addListener("error", function(event) {
1382+
valid = false;
1383+
});
1384+
13791385
var result = parser.parse("@-webkit-keyframes movingbox{0%{left:90%;}}");
1380-
assert.isTrue(true); //just don't want an error
1386+
assert.isTrue(valid);
13811387
},
13821388

13831389
testMozKeyFrames: function(){
13841390
var parser = new Parser({strict:true});
1391+
var valid = true;
1392+
1393+
parser.addListener("error", function(event) {
1394+
valid = false;
1395+
});
1396+
13851397
var result = parser.parse("@-moz-keyframes movingbox{0%{left:90%;}50%{left:10%;}100%{left:90%;}}");
1386-
assert.isTrue(true); //just don't want an error
1398+
assert.isTrue(valid);
13871399
},
13881400

13891401
testKeyFrames: function(){
13901402
var parser = new Parser({strict:true});
1403+
var valid = true;
1404+
1405+
parser.addListener("error", function(event) {
1406+
valid = false;
1407+
});
1408+
13911409
var result = parser.parse("@keyframes movingbox{0%{left:90%;}50%{left:10%;}100%{left:90%;}}");
1392-
assert.isTrue(true); //just don't want an error
1410+
assert.isTrue(valid);
13931411
},
13941412

13951413
testKeyFramesFromTo: function(){
13961414
var parser = new Parser({strict:true});
1415+
var valid = true;
1416+
1417+
parser.addListener("error", function(event) {
1418+
valid = false;
1419+
});
1420+
13971421
var result = parser.parse("@keyframes movingbox{from{left:90%;-webkit-transform: rotate(0deg);}to{left:10%;-webkit-transform: rotate(360deg);}}");
1398-
assert.isTrue(true); //just don't want an error
1422+
assert.isTrue(valid);
13991423
},
14001424

14011425
testKeyFramesWithWhitespace: function(){
14021426
var parser = new Parser({strict:true});
1427+
var valid = true;
1428+
1429+
parser.addListener("error", function(event) {
1430+
valid = false;
1431+
});
1432+
14031433
var result = parser.parse("@keyframes 'diagonal-slide' { from { left: 0; top: 0; } to { left: 100px; top: 100px; } }");
1404-
assert.isTrue(true);
1434+
assert.isTrue(valid);
14051435
}
14061436

14071437
}));
@@ -1412,38 +1442,74 @@ <h1>CSS Parser Tests</h1>
14121442

14131443
testMediaWithPage: function(){
14141444
var parser = new Parser({ strict: true});
1445+
var valid = true;
1446+
1447+
parser.addListener("error", function(event) {
1448+
valid = false;
1449+
});
1450+
14151451
var result = parser.parse("@media { @page {} }");
1416-
assert.isTrue(true); //just don't want an error
1452+
assert.isTrue(valid);
14171453
},
14181454

14191455
testMediaWithTypeOnly: function(){
14201456
var parser = new Parser({ strict: true});
1457+
var valid = true;
1458+
1459+
parser.addListener("error", function(event) {
1460+
valid = false;
1461+
});
1462+
14211463
var result = parser.parse("@media print { }");
1422-
assert.isTrue(true); //just don't want an error
1464+
assert.isTrue(valid);
14231465
},
14241466

14251467
testMediaWithTypesOnly: function(){
14261468
var parser = new Parser({ strict: true});
1469+
var valid = true;
1470+
1471+
parser.addListener("error", function(event) {
1472+
valid = false;
1473+
});
1474+
14271475
var result = parser.parse("@media print, screen { }");
1428-
assert.isTrue(true); //just don't want an error
1476+
assert.isTrue(valid);
14291477
},
14301478

14311479
testMediaWithSimpleExpression: function(){
14321480
var parser = new Parser({ strict: true});
1481+
var valid = true;
1482+
1483+
parser.addListener("error", function(event) {
1484+
valid = false;
1485+
});
1486+
14331487
var result = parser.parse("@media (max-width:400px) { }");
1434-
assert.isTrue(true); //just don't want an error
1488+
assert.isTrue(valid);
14351489
},
14361490

14371491
testMediaWithComplexExpression: function(){
14381492
var parser = new Parser({ strict: true});
1493+
var valid = true;
1494+
1495+
parser.addListener("error", function(event) {
1496+
valid = false;
1497+
});
1498+
14391499
var result = parser.parse("@media all and (max-width:400px) { }");
1440-
assert.isTrue(true); //just don't want an error
1500+
assert.isTrue(valid);
14411501
},
14421502

14431503
testViewport: function(){
14441504
var parser = new Parser({ strict: true});
1505+
var valid = true;
1506+
1507+
parser.addListener("error", function(event) {
1508+
valid = false;
1509+
});
1510+
14451511
var result = parser.parse("@viewport { width: 397px; }");
1446-
assert.isTrue(true); //just don't want an error
1512+
assert.isTrue(valid);
14471513
},
14481514

14491515
testClassesWithEscapes: function(){

‎tests/css/Parser.js

Lines changed: 119 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,26 +1458,50 @@
14581458

14591459
testMozKeyFrames: function(){
14601460
var parser = new Parser({strict:true});
1461+
var valid = true;
1462+
1463+
parser.addListener("error", function(event) {
1464+
valid = false;
1465+
});
1466+
14611467
var result = parser.parse("@-moz-keyframes movingbox{0%{left:90%;}50%{left:10%;}100%{left:90%;}}");
1462-
Assert.isTrue(true); //just don't want an error
1468+
Assert.isTrue(valid);
14631469
},
14641470

14651471
testKeyFrames: function(){
14661472
var parser = new Parser({strict:true});
1473+
var valid = true;
1474+
1475+
parser.addListener("error", function(event) {
1476+
valid = false;
1477+
});
1478+
14671479
var result = parser.parse("@keyframes movingbox{0%{left:90%;}50%{left:10%;}100%{left:90%;}}");
1468-
Assert.isTrue(true); //just don't want an error
1480+
Assert.isTrue(valid);
14691481
},
14701482

14711483
testKeyFramesFromTo: function(){
14721484
var parser = new Parser({strict:true});
1485+
var valid = true;
1486+
1487+
parser.addListener("error", function(event) {
1488+
valid = false;
1489+
});
1490+
14731491
var result = parser.parse("@keyframes movingbox{from{left:90%;-webkit-transform: rotate(0deg);}to{left:10%;-webkit-transform: rotate(360deg);}}");
1474-
Assert.isTrue(true); //just don't want an error
1492+
Assert.isTrue(valid);
14751493
},
14761494

14771495
testKeyFramesWithWhitespace: function(){
14781496
var parser = new Parser({strict:true});
1497+
var valid = true;
1498+
1499+
parser.addListener("error", function(event) {
1500+
valid = false;
1501+
});
1502+
14791503
var result = parser.parse("@keyframes 'diagonal-slide' { from { left: 0; top: 0; } to { left: 100px; top: 100px; } }");
1480-
Assert.isTrue(true);
1504+
Assert.isTrue(valid);
14811505
}
14821506

14831507
}));
@@ -1488,80 +1512,158 @@
14881512

14891513
testMediaWithPage: function(){
14901514
var parser = new Parser({ strict: true});
1515+
var valid = true;
1516+
1517+
parser.addListener("error", function(event) {
1518+
valid = false;
1519+
});
1520+
14911521
var result = parser.parse("@media { @page {} }");
1492-
Assert.isTrue(true); //just don't want an error
1522+
Assert.isTrue(valid);
14931523
},
14941524

14951525
testMediaWithFontFace: function(){
14961526
var parser = new Parser({ strict: true});
1527+
var valid = true;
1528+
1529+
parser.addListener("error", function(event) {
1530+
valid = false;
1531+
});
1532+
14971533
var result = parser.parse("@media { @font-face {} }");
1498-
Assert.isTrue(true); //just don't want an error
1534+
Assert.isTrue(valid);
14991535
},
15001536

15011537
testMediaWithViewport: function(){
15021538
var parser = new Parser({ strict: true});
1539+
var valid = true;
1540+
1541+
parser.addListener("error", function(event) {
1542+
valid = false;
1543+
});
1544+
15031545
var result = parser.parse("@media { @viewport {} }");
1504-
Assert.isTrue(true); //just don't want an error
1546+
Assert.isTrue(valid);
15051547
},
15061548

15071549
testMediaWithTypeOnly: function(){
15081550
var parser = new Parser({ strict: true});
1551+
var valid = true;
1552+
1553+
parser.addListener("error", function(event) {
1554+
valid = false;
1555+
});
1556+
15091557
var result = parser.parse("@media print { }");
1510-
Assert.isTrue(true); //just don't want an error
1558+
Assert.isTrue(valid);
15111559
},
15121560

15131561
testMediaWithTypesOnly: function(){
15141562
var parser = new Parser({ strict: true});
1563+
var valid = true;
1564+
1565+
parser.addListener("error", function(event) {
1566+
valid = false;
1567+
});
1568+
15151569
var result = parser.parse("@media print, screen { }");
1516-
Assert.isTrue(true); //just don't want an error
1570+
Assert.isTrue(valid);
15171571
},
15181572

15191573
testMediaWithSimpleExpression: function(){
15201574
var parser = new Parser({ strict: true});
1575+
var valid = true;
1576+
1577+
parser.addListener("error", function(event) {
1578+
valid = false;
1579+
});
1580+
15211581
var result = parser.parse("@media (max-width:400px) { }");
1522-
Assert.isTrue(true); //just don't want an error
1582+
Assert.isTrue(valid);
15231583
},
15241584

15251585
testMediaWithComplexExpression: function(){
15261586
var parser = new Parser({ strict: true});
1587+
var valid = true;
1588+
1589+
parser.addListener("error", function(event) {
1590+
valid = false;
1591+
});
1592+
15271593
var result = parser.parse("@media all and (max-width:400px) { }");
1528-
Assert.isTrue(true); //just don't want an error
1594+
Assert.isTrue(valid);
15291595
},
15301596

15311597
testMediaWithSimpleExpressionWithSpaces: function(){
15321598
var parser = new Parser({ strict: true});
1599+
var valid = true;
1600+
1601+
parser.addListener("error", function(event) {
1602+
valid = false;
1603+
});
1604+
15331605
var result = parser.parse("@media ( max-width:400px ) { }");
1534-
Assert.isTrue(true); //just don't want an error
1606+
Assert.isTrue(valid);
15351607
},
15361608

15371609
testMediaWithComplexExpressionWithSpaces: function(){
15381610
var parser = new Parser({ strict: true});
1611+
var valid = true;
1612+
1613+
parser.addListener("error", function(event) {
1614+
valid = false;
1615+
});
1616+
15391617
var result = parser.parse("@media all and ( max-width:400px ) { }");
1540-
Assert.isTrue(true); //just don't want an error
1618+
Assert.isTrue(valid);
15411619
},
15421620

15431621
testViewport: function(){
15441622
var parser = new Parser({ strict: true});
1623+
var valid = true;
1624+
1625+
parser.addListener("error", function(event) {
1626+
valid = false;
1627+
});
1628+
15451629
var result = parser.parse("@viewport { width: 397px; }");
1546-
Assert.isTrue(true); //just don't want an error
1630+
Assert.isTrue(valid);
15471631
},
15481632

15491633
testMSViewport: function(){
15501634
var parser = new Parser({ strict: true});
1635+
var valid = true;
1636+
1637+
parser.addListener("error", function(event) {
1638+
valid = false;
1639+
});
1640+
15511641
var result = parser.parse("@-ms-viewport { width: 397px; }");
1552-
Assert.isTrue(true);
1642+
Assert.isTrue(valid);
15531643
},
15541644

15551645
testMSViewportInsideDeviceWidth: function(){
15561646
var parser = new Parser({ strict: true});
1647+
var valid = true;
1648+
1649+
parser.addListener("error", function(event) {
1650+
valid = false;
1651+
});
1652+
15571653
var result = parser.parse("@-ms-viewport { width: device-width; }");
1558-
Assert.isTrue(true);
1654+
Assert.isTrue(valid);
15591655
},
15601656

15611657
testMSViewportInsideDeviceHeight: function(){
15621658
var parser = new Parser({ strict: true});
1659+
var valid = true;
1660+
1661+
parser.addListener("error", function(event) {
1662+
valid = false;
1663+
});
1664+
15631665
var result = parser.parse("@-ms-viewport { width: device-height; }");
1564-
Assert.isTrue(true);
1666+
Assert.isTrue(valid);
15651667
},
15661668

15671669
testViewportEventFires: function(){

0 commit comments

Comments
 (0)