preserve original case

Author: rbri

src/main/java/com/gargoylesoftware/css/dom/CSSStyleSheetImpl.java

@@ -383,7 +383,7 @@ public static class CSSStyleSheetRuleIndex {
 
         public void addElementSelector(final ElementSelector elementSelector,
                                         final Selector s, final CSSStyleRuleImpl styleRule) {
-            final String elementName = elementSelector.getLocalName();
+            final String elementName = elementSelector.getLocalNameLowerCase();
             List<SelectorEntry> entries = elementSelectors_.get(elementName);
             if (entries == null) {
                 entries = new ArrayList<SelectorEntry>();
@@ -395,7 +395,7 @@ public void addElementSelector(final ElementSelector elementSelector,
 
         public void addClassSelector(final ElementSelector elementSelector, final String className,
                 final Selector s, final CSSStyleRuleImpl styleRule) {
-            final String elementName = elementSelector.getLocalName();
+            final String elementName = elementSelector.getLocalNameLowerCase();
             final String key;
             if (elementName == null) {
                 key = "." + className;

src/main/java/com/gargoylesoftware/css/parser/selector/ElementSelector.java

@@ -28,15 +28,18 @@
 public class ElementSelector extends AbstractSelector implements SimpleSelector, Serializable {
 
     private final String localName_;
+    private final String localNameLC_;
     private List<Condition> conditions_;
 
     public ElementSelector(final String localName, final Locator locator) {
+        localName_ = localName;
         if (localName != null) {
-            localName_ = localName.toLowerCase(Locale.ROOT);
+            localNameLC_ = localName.toLowerCase(Locale.ROOT);
         }
         else {
-            localName_ = null;
+            localNameLC_ = null;
         }
+
         setLocator(locator);
     }
 
@@ -50,13 +53,14 @@ public SimpleSelector getSimpleSelector() {
         return this;
     }
 
-    /**
-     * @return the local name in lower case.
-     */
     public String getLocalName() {
         return localName_;
     }
 
+    public String getLocalNameLowerCase() {
+        return localNameLC_;
+    }
+
     public String getElementName() {
         final String localeName = getLocalName();
         if (localeName == null) {

src/test/java/com/gargoylesoftware/css/TestException.java

@@ -57,13 +57,13 @@ public void test() throws Exception {
 
         Assert.assertEquals("@charset \"US-ASCII\";", rules.item(0).getCssText());
         Assert.assertEquals("@import url(http://www.steadystate.com/primary.css);", rules.item(1).getCssText());
-        Assert.assertEquals("p { color: blue }", rules.item(2).getCssText());
+        Assert.assertEquals("P { color: blue }", rules.item(2).getCssText());
 
         stylesheet.deleteRule(1);
 
         Assert.assertEquals(2, rules.getLength());
         Assert.assertEquals("@charset \"US-ASCII\";", rules.item(0).getCssText());
-        Assert.assertEquals("p { color: blue }", rules.item(1).getCssText());
+        Assert.assertEquals("P { color: blue }", rules.item(1).getCssText());
 
         CSSRule rule = rules.item(1);
         rule.setCssText("h2 { smell: strong }");

src/test/java/com/gargoylesoftware/css/parser/CSS3ParserTest.java

@@ -170,15 +170,15 @@ public void selectorLang() throws Exception {
         Assert.assertEquals("de", ((LangCondition) selector.getConditions().get(0)).getLang());
 
         rule = rules.item(2);
-        Assert.assertEquals("*:lang(fr) > q { }", rule.getCssText());
+        Assert.assertEquals("*:lang(fr) > Q { }", rule.getCssText());
         Assert.assertEquals(CSSRule.STYLE_RULE, rule.getType());
         ChildSelector childSelector = (ChildSelector) ((CSSStyleRuleImpl) rule).getSelectors().get(0);
         selector = (ElementSelector) childSelector.getAncestorSelector();
         Assert.assertEquals(ConditionType.LANG_CONDITION, selector.getConditions().get(0).getConditionType());
         Assert.assertEquals("fr", ((LangCondition) selector.getConditions().get(0)).getLang());
 
         rule = rules.item(3);
-        Assert.assertEquals("*:lang(de) > q { }", rule.getCssText());
+        Assert.assertEquals("*:lang(de) > Q { }", rule.getCssText());
         Assert.assertEquals(CSSRule.STYLE_RULE, rule.getType());
         childSelector = (ChildSelector) ((CSSStyleRuleImpl) rule).getSelectors().get(0);
         selector = (ElementSelector) childSelector.getAncestorSelector();
@@ -1124,32 +1124,32 @@ public void counter() throws Exception {
         Assert.assertEquals(5, rules.getLength());
 
         CSSRule rule = rules.item(0);
-        Assert.assertEquals("h1:before { content: counter(chno, upper-latin) \". \" }", rule.getCssText());
+        Assert.assertEquals("H1:before { content: counter(chno, upper-latin) \". \" }", rule.getCssText());
         Assert.assertEquals(CSSRule.STYLE_RULE, rule.getType());
         CSSValueImpl value = (CSSValueImpl) ((CSSStyleRule) rule).getStyle().getPropertyCSSValue("content");
         Assert.assertEquals("counter(chno, upper-latin)", ((CSSValueImpl) value.item(0)).getCounterValue().toString());
 
         rule = rules.item(1);
-        Assert.assertEquals("h2:before { content: counter(section, upper-roman) \" - \" }", rule.getCssText());
+        Assert.assertEquals("H2:before { content: counter(section, upper-roman) \" - \" }", rule.getCssText());
         Assert.assertEquals(CSSRule.STYLE_RULE, rule.getType());
         value = (CSSValueImpl) ((CSSStyleRule) rule).getStyle().getPropertyCSSValue("content");
         Assert.assertEquals("counter(section, upper-roman)",
                 ((CSSValueImpl) value.item(0)).getCounterValue().toString());
 
         rule = rules.item(2);
-        Assert.assertEquals("blockquote:after { content: \" [\" counter(bq, lower-greek) \"]\" }", rule.getCssText());
+        Assert.assertEquals("BLOCKQUOTE:after { content: \" [\" counter(bq, lower-greek) \"]\" }", rule.getCssText());
         Assert.assertEquals(CSSRule.STYLE_RULE, rule.getType());
         value = (CSSValueImpl) ((CSSStyleRule) rule).getStyle().getPropertyCSSValue("content");
         Assert.assertEquals("counter(bq, lower-greek)", ((CSSValueImpl) value.item(1)).getCounterValue().toString());
 
         rule = rules.item(3);
-        Assert.assertEquals("div.note:before { content: counter(notecntr, disc) \" \" }", rule.getCssText());
+        Assert.assertEquals("DIV.note:before { content: counter(notecntr, disc) \" \" }", rule.getCssText());
         Assert.assertEquals(CSSRule.STYLE_RULE, rule.getType());
         value = (CSSValueImpl) ((CSSStyleRule) rule).getStyle().getPropertyCSSValue("content");
         Assert.assertEquals("counter(notecntr, disc)", ((CSSValueImpl) value.item(0)).getCounterValue().toString());
 
         rule = rules.item(4);
-        Assert.assertEquals("p:before { content: counter(p, none) }", rule.getCssText());
+        Assert.assertEquals("P:before { content: counter(p, none) }", rule.getCssText());
         Assert.assertEquals(CSSRule.STYLE_RULE, rule.getType());
         value = (CSSValueImpl) ((CSSStyleRule) rule).getStyle().getPropertyCSSValue("content");
         Assert.assertEquals("counter(p, none)", value.getCounterValue().toString());
@@ -1170,7 +1170,7 @@ public void counters() throws Exception {
         Assert.assertEquals(1, rules.getLength());
 
         final CSSRule rule = rules.item(0);
-        Assert.assertEquals("li:before { content: counters(item, \".\") \" \"; counter-increment: item }",
+        Assert.assertEquals("LI:before { content: counters(item, \".\") \" \"; counter-increment: item }",
                 rule.getCssText());
         Assert.assertEquals(CSSRule.STYLE_RULE, rule.getType());
         final CSSValueImpl value = (CSSValueImpl) ((CSSStyleRule) rule).getStyle().getPropertyCSSValue("content");
@@ -2725,7 +2725,7 @@ public void cdoCdc() throws Exception {
         Assert.assertEquals(15, rules.getLength());
 
         CSSRule rule = rules.item(0);
-        Assert.assertEquals("ol { list-style-type: lower-alpha }", rule.getCssText());
+        Assert.assertEquals("OL { list-style-type: lower-alpha }", rule.getCssText());
 
         rule = rules.item(1);
         Assert.assertEquals("*.a { color: green; background: white none }", rule.getCssText());

src/test/java/com/gargoylesoftware/css/parser/CSSOMParserTest.java

@@ -16,7 +16,6 @@
 
 import java.io.Reader;
 import java.io.StringReader;
-import java.util.Locale;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -83,7 +82,7 @@ public void parseStyleSheet() throws Exception {
         Assert.assertEquals(CSSRule.STYLE_RULE, rule.getType());
 
         final CSSStyleRule sr = (CSSStyleRule) rule;
-        Assert.assertEquals(testSelector_.toLowerCase(Locale.ROOT), sr.getSelectorText());
+        Assert.assertEquals(testSelector_, sr.getSelectorText());
 
         final CSSStyleDeclaration style = sr.getStyle();
         Assert.assertEquals(testItem_, style.item(0));
@@ -123,7 +122,7 @@ public void parseSelectors() throws Exception {
         final InputSource is = new InputSource(r);
         final SelectorList sl = new CSSOMParser().parseSelectors(is);
 
-        Assert.assertEquals(testSelector_.toLowerCase(Locale.ROOT), sl.get(0).toString());
+        Assert.assertEquals(testSelector_, sl.get(0).toString());
     }
 
     /**