simplify and more detailed tests

Author: rbri

src/main/javacc/CSS3Parser.jj

@@ -103,7 +103,7 @@ TOKEN_MGR_DECLS :
 // {s}          {return S;}
     < S: ( " "|"\t"|"\r"|"\n"|"\f" )+ >
 // w        {s}?
-    | < W: ( <S> )? >
+//    | < W: ( <S> )? >
 }
 
 <DEFAULT> MORE :
@@ -315,7 +315,7 @@ TOKEN_MGR_DECLS :
 | < CHARSET_SYM: "@" <C_LETTER> <H_LETTER> <A_LETTER> <R_LETTER> <S_LETTER> <E_LETTER> <T_LETTER> >
 
 // "!"({w}|{comment})*{I}{M}{P}{O}{R}{T}{A}{N}{T}   {return IMPORTANT_SYM;}
-| < IMPORTANT_SYM: "!" ( <W> | <COMMENT_> )* <I_LETTER> <M_LETTER> <P_LETTER> <O_LETTER> <R_LETTER> <T_LETTER> <A_LETTER> <N_LETTER> <T_LETTER> >
+| < IMPORTANT_SYM: "!" ( <S> | <COMMENT_> )* <I_LETTER> <M_LETTER> <P_LETTER> <O_LETTER> <R_LETTER> <T_LETTER> <A_LETTER> <N_LETTER> <T_LETTER> >
 
 // {num}{E}{M}          {return EMS;}
 | < EMS: <NUM> <E_LETTER> <M_LETTER> > { matchedToken.image = ParserUtils.trimBy(image, 0, 2); }

src/test/java/org/htmlunit/cssparser/parser/ImportantTest.java

@@ -71,7 +71,7 @@ private void css() throws Exception {
         assertEquals(0, errorHandler.getWarningCount());
 
         final CSSRuleListImpl rules = ss.getCssRules();
-        assertEquals(5, rules.getLength());
+        assertEquals(7, rules.getLength());
 
         AbstractCSSRuleImpl rule = rules.getRules().get(0);
         assertEquals("*.sel1 { padding: 0 !important; }", rule.getCssText());
@@ -86,6 +86,12 @@ private void css() throws Exception {
         assertEquals("*.sel4 { font-weight: normal !important; }", rule.getCssText());
 
         rule = rules.getRules().get(4);
+        assertEquals("*.sel5 { font-weight: normal !important; }", rule.getCssText());
+
+        rule = rules.getRules().get(5);
+        assertEquals("*.sel6 { font-weight: normal !important; }", rule.getCssText());
+
+        rule = rules.getRules().get(6);
         assertEquals("*.important { font-weight: bold; }", rule.getCssText());
     }
 

src/test/resources/important.css

@@ -12,6 +12,14 @@
  important;
 }
 
+.sel5 {
+  font-weight: normal !/*really*/important;
+}
+
+.sel6 {
+  font-weight: normal !    /*really*/     important;
+}
+
 .important {
   font-weight: bold
 }