Fix assert on unknown rule type in the BisonCSSParser::endRuleHeader.

Source/core/css/parser/BisonCSSParserTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/parser/BisonCSSParser.h"
 
 #include "core/css/CSSTimingFunctionValue.h"
+#include "core/css/MediaList.h"
+#include "core/css/StyleRule.h"
 #include "platform/animation/TimingFunction.h"
 
 #include <gtest/gtest.h>
 
 namespace WebCore {
 
 TEST(BisonCSSParserTest, ParseAnimationTimingFunctionValue)
 {
     RefPtrWillBeRawPtr<CSSValue> timingFunctionValue;
     timingFunctionValue = BisonCSSParser::parseAnimationTimingFunctionValue("ease");
@@ skipping 38 matching lines @@
     timingFunctionValue = BisonCSSParser::parseAnimationTimingFunctionValue("steps(3)");
     EXPECT_TRUE(CSSStepsTimingFunctionValue::create(3, StepsTimingFunction::StepAtEnd)->equals(toCSSStepsTimingFunctionValue(*timingFunctionValue.get())));
 
     timingFunctionValue = BisonCSSParser::parseAnimationTimingFunctionValue("cubic-bezier(0.1, 5, 0.23, 0)");
     EXPECT_TRUE(CSSCubicBezierTimingFunctionValue::create(0.1, 5, 0.23, 0)->equals(toCSSCubicBezierTimingFunctionValue(*timingFunctionValue.get())));
 
     timingFunctionValue = BisonCSSParser::parseAnimationTimingFunctionValue("cubic-bezier(0.1, 0, 4, 0.4)");
     EXPECT_EQ(0, timingFunctionValue.get());
 }
 
+
+static void testMediaQuery(const char* expected, MediaQuerySet& querySet)
+{
+    const WillBeHeapVector<OwnPtrWillBeMember<MediaQuery> >& queryVector = querySet.queryVector();
+    size_t queryVectorSize = queryVector.size();
+    StringBuilder output;
+
+    for (size_t i = 0; i < queryVectorSize; ) {
+        String queryText = queryVector[i]->cssText();
+        output.append(queryText);
+        ++i;
+        if (i >= queryVectorSize)
+            break;
+        output.append(", ");
+    }
+    ASSERT_STREQ(expected, output.toString().ascii().data());
+}
+
+TEST(BisonCSSParserTest, MediaQuery)
+{
+    struct {
+        const char* input;
+        const char* output;
+    } testCases[] = {
+        {"@media s} {}", "not all"},
+        {"@media } {}", "not all"},
+        {"@media tv {}", "tv"},
+        {"@media tv, screen {}", "tv, screen"},
+        {"@media s}, tv {}", "not all, tv"},
+        {"@media tv, screen and (}) {}", "tv, not all"},
+        {0, 0} // Do not remove the terminator line.
+    };
+
+    BisonCSSParser parser(strictCSSParserContext());
+
+    for (unsigned i = 0; testCases[i].input; ++i) {

[Julien - ping for review, 2014/07/18 21:14:31]

You can actually do without the terminator as |testCases| is an inline array:

for (unsigned i = 0; i < sizeof(testCases)/sizeof(testCases[0]); ++i)

[alancutter (OOO until 2018), 2014/07/21 05:58:10]

We can go one step further and use the macro ARRAY_SIZE(testCases).

+        RefPtrWillBeRawPtr<StyleRuleBase> rule = parser.parseRule(nullptr, String(testCases[i].input));
+
+        EXPECT_TRUE(rule->isMediaRule());
+        testMediaQuery(testCases[i].output, *static_cast<StyleRuleMedia*>(rule.get())->mediaQueries());
+    }
+}
+
 } // namespace WebCore