Skip to content

Commit 12b1af3

Browse files
jawshooahjawshooah
committed
Explicitly check for errors in test cases
1 parent 78bb3fb commit 12b1af3

File tree

2 files changed

+160
-40
lines changed

2 files changed

+160
-40
lines changed

‎tests/css/CSSParserTests.htm

Lines changed: 80 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,63 +1447,123 @@ <h1>CSS Parser Tests</h1>
14471447
},
14481448

14491449
testDocumentUrl: function(){
1450-
var parser = new Parser({ strict: true});
1450+
var parser = new Parser({ strict: true}),
1451+
valid = true;
1452+
1453+
parser.addListener("error", function(event) {
1454+
valid = false;
1455+
});
1456+
14511457
var result = parser.parse("@document url(http://www.w3.org/) { p { color: red; } }");
1452-
assert.isTrue(true); //just don't want an error
1458+
assert.isTrue(valid);
14531459
},
14541460

14551461
testDocumentUrlPrefix: function(){
1456-
var parser = new Parser({ strict: true});
1462+
var parser = new Parser({ strict: true}),
1463+
valid = true;
1464+
1465+
parser.addListener("error", function(event) {
1466+
valid = false;
1467+
});
1468+
14571469
var result = parser.parse("@document url-prefix(http://www.w3.org/) { p { color: red; } }");
1458-
assert.isTrue(true); //just don't want an error
1470+
assert.isTrue(valid);
14591471
},
14601472

14611473
testDocumentDomain: function(){
1462-
var parser = new Parser({ strict: true});
1474+
var parser = new Parser({ strict: true}),
1475+
valid = true;
1476+
1477+
parser.addListener("error", function(event) {
1478+
valid = false;
1479+
});
1480+
14631481
var result = parser.parse("@document domain(w3.org) { p { color: red; } }");
1464-
assert.isTrue(true); //just don't want an error
1482+
assert.isTrue(valid);
14651483
},
14661484

14671485
testDocumentRegexp: function(){
1468-
var parser = new Parser({ strict: true});
1486+
var parser = new Parser({ strict: true}),
1487+
valid = true;
1488+
1489+
parser.addListener("error", function(event) {
1490+
valid = false;
1491+
});
1492+
14691493
var result = parser.parse("@document regexp('https:.*') { p { color: red; } }");
1470-
assert.isTrue(true); //just don't want an error
1494+
assert.isTrue(valid);
14711495
},
14721496

14731497
testDocumentMultipleFunctions: function(){
1474-
var parser = new Parser({ strict: true});
1498+
var parser = new Parser({ strict: true}),
1499+
valid = true;
1500+
1501+
parser.addListener("error", function(event) {
1502+
valid = false;
1503+
});
1504+
14751505
var result = parser.parse("@document url-prefix(http://www.w3.org/), domain(w3.org) { p { color: red; } }");
1476-
assert.isTrue(true); //just don't want an error
1506+
assert.isTrue(valid);
14771507
},
14781508

14791509
testMozDocument: function(){
1480-
var parser = new Parser({ strict: true});
1510+
var parser = new Parser({ strict: true}),
1511+
valid = true;
1512+
1513+
parser.addListener("error", function(event) {
1514+
valid = false;
1515+
});
1516+
14811517
var result = parser.parse("@-moz-document url-prefix() { p { color: red; } }");
1482-
assert.isTrue(true); //just don't want an error
1518+
assert.isTrue(valid);
14831519
},
14841520

14851521
testDocumentWithPage: function(){
1486-
var parser = new Parser({ strict: true});
1522+
var parser = new Parser({ strict: true}),
1523+
valid = true;
1524+
1525+
parser.addListener("error", function(event) {
1526+
valid = false;
1527+
});
1528+
14871529
var result = parser.parse("@document url-prefix() { @page {} p { color: red; } }");
1488-
assert.isTrue(true); //just don't want an error
1530+
assert.isTrue(valid);
14891531
},
14901532

14911533
testDocumentWithMedia: function(){
1492-
var parser = new Parser({ strict: true});
1534+
var parser = new Parser({ strict: true}),
1535+
valid = true;
1536+
1537+
parser.addListener("error", function(event) {
1538+
valid = false;
1539+
});
1540+
14931541
var result = parser.parse("@document url-prefix() { @media {} p { color: red; } }");
1494-
assert.isTrue(true); //just don't want an error
1542+
assert.isTrue(valid);
14951543
},
14961544

14971545
testDocumentWithFontFace: function(){
1498-
var parser = new Parser({ strict: true});
1546+
var parser = new Parser({ strict: true}),
1547+
valid = true;
1548+
1549+
parser.addListener("error", function(event) {
1550+
valid = false;
1551+
});
1552+
14991553
var result = parser.parse("@document url-prefix() { @font-face {} p { color: red; } }");
1500-
assert.isTrue(true); //just don't want an error
1554+
assert.isTrue(valid);
15011555
},
15021556

15031557
testDocumentWithViewport: function(){
1504-
var parser = new Parser({ strict: true});
1558+
var parser = new Parser({ strict: true}),
1559+
valid = true;
1560+
1561+
parser.addListener("error", function(event) {
1562+
valid = false;
1563+
});
1564+
15051565
var result = parser.parse("@document url-prefix() { @viewport {} p { color: red; } }");
1506-
assert.isTrue(true); //just don't want an error
1566+
assert.isTrue(valid);
15071567
},
15081568

15091569
testDocumentEventFires: function(){

‎tests/css/Parser.js

Lines changed: 80 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,63 +1575,123 @@
15751575
},
15761576

15771577
testDocumentUrl: function(){
1578-
var parser = new Parser({ strict: true});
1578+
var parser = new Parser({ strict: true}),
1579+
valid = true;
1580+
1581+
parser.addListener("error", function(event) {
1582+
valid = false;
1583+
});
1584+
15791585
var result = parser.parse("@document url(http://www.w3.org/) { p { color: red; } }");
1580-
Assert.isTrue(true); //just don't want an error
1586+
Assert.isTrue(valid);
15811587
},
15821588

15831589
testDocumentUrlPrefix: function(){
1584-
var parser = new Parser({ strict: true});
1590+
var parser = new Parser({ strict: true}),
1591+
valid = true;
1592+
1593+
parser.addListener("error", function(event) {
1594+
valid = false;
1595+
});
1596+
15851597
var result = parser.parse("@document url-prefix(http://www.w3.org/) { p { color: red; } }");
1586-
Assert.isTrue(true); //just don't want an error
1598+
Assert.isTrue(valid);
15871599
},
15881600

15891601
testDocumentDomain: function(){
1590-
var parser = new Parser({ strict: true});
1602+
var parser = new Parser({ strict: true}),
1603+
valid = true;
1604+
1605+
parser.addListener("error", function(event) {
1606+
valid = false;
1607+
});
1608+
15911609
var result = parser.parse("@document domain(w3.org) { p { color: red; } }");
1592-
Assert.isTrue(true); //just don't want an error
1610+
Assert.isTrue(valid);
15931611
},
15941612

15951613
testDocumentRegexp: function(){
1596-
var parser = new Parser({ strict: true});
1614+
var parser = new Parser({ strict: true}),
1615+
valid = true;
1616+
1617+
parser.addListener("error", function(event) {
1618+
valid = false;
1619+
});
1620+
15971621
var result = parser.parse("@document regexp('https:.*') { p { color: red; } }");
1598-
Assert.isTrue(true); //just don't want an error
1622+
Assert.isTrue(valid);
15991623
},
16001624

16011625
testDocumentMultipleFunctions: function(){
1602-
var parser = new Parser({ strict: true});
1626+
var parser = new Parser({ strict: true}),
1627+
valid = true;
1628+
1629+
parser.addListener("error", function(event) {
1630+
valid = false;
1631+
});
1632+
16031633
var result = parser.parse("@document url-prefix(http://www.w3.org/), domain(w3.org) { p { color: red; } }");
1604-
Assert.isTrue(true); //just don't want an error
1634+
Assert.isTrue(valid);
16051635
},
16061636

16071637
testMozDocument: function(){
1608-
var parser = new Parser({ strict: true});
1638+
var parser = new Parser({ strict: true}),
1639+
valid = true;
1640+
1641+
parser.addListener("error", function(event) {
1642+
valid = false;
1643+
});
1644+
16091645
var result = parser.parse("@-moz-document url-prefix() { p { color: red; } }");
1610-
Assert.isTrue(true); //just don't want an error
1646+
Assert.isTrue(valid);
16111647
},
16121648

16131649
testDocumentWithPage: function(){
1614-
var parser = new Parser({ strict: true});
1650+
var parser = new Parser({ strict: true}),
1651+
valid = true;
1652+
1653+
parser.addListener("error", function(event) {
1654+
valid = false;
1655+
});
1656+
16151657
var result = parser.parse("@document url-prefix() { @page {} p { color: red; } }");
1616-
Assert.isTrue(true); //just don't want an error
1658+
Assert.isTrue(valid);
16171659
},
16181660

16191661
testDocumentWithMedia: function(){
1620-
var parser = new Parser({ strict: true});
1662+
var parser = new Parser({ strict: true}),
1663+
valid = true;
1664+
1665+
parser.addListener("error", function(event) {
1666+
valid = false;
1667+
});
1668+
16211669
var result = parser.parse("@document url-prefix() { @media {} p { color: red; } }");
1622-
Assert.isTrue(true); //just don't want an error
1670+
Assert.isTrue(valid);
16231671
},
16241672

16251673
testDocumentWithFontFace: function(){
1626-
var parser = new Parser({ strict: true});
1674+
var parser = new Parser({ strict: true}),
1675+
valid = true;
1676+
1677+
parser.addListener("error", function(event) {
1678+
valid = false;
1679+
});
1680+
16271681
var result = parser.parse("@document url-prefix() { @font-face {} p { color: red; } }");
1628-
Assert.isTrue(true); //just don't want an error
1682+
Assert.isTrue(valid);
16291683
},
16301684

16311685
testDocumentWithViewport: function(){
1632-
var parser = new Parser({ strict: true});
1686+
var parser = new Parser({ strict: true}),
1687+
valid = true;
1688+
1689+
parser.addListener("error", function(event) {
1690+
valid = false;
1691+
});
1692+
16331693
var result = parser.parse("@document url-prefix() { @viewport {} p { color: red; } }");
1634-
Assert.isTrue(true); //just don't want an error
1694+
Assert.isTrue(valid);
16351695
},
16361696

16371697
testDocumentEventFires: function(){

0 commit comments

Comments
 (0)