More tests for correct border behavior

Author: FlorianRappl

src/AngleSharp.Css.Tests/Styling/CssSheet.cs

@@ -925,6 +925,60 @@ public void CssStyleSheetShouldIgnoreHtmlCommentTokens()
             Assert.AreEqual("none", div.Style.GetDisplay());
         }
 
+        [Test]
+        public void CssStyleSheetShouldExpandBorderColorCorrectly_Issue23()
+        {
+            var parser = new CssParser();
+            var source = "body { border-color: red }";
+            var sheet = parser.ParseStyleSheet(source);
+
+            Assert.AreEqual(1, sheet.Rules.Length);
+            Assert.AreEqual(CssRuleType.Style, sheet.Rules[0].Type);
+
+            var body = sheet.Rules[0] as ICssStyleRule;
+            Assert.AreEqual("border-color: rgba(255, 0, 0, 1)", body.Style.CssText);
+            Assert.AreEqual("rgba(255, 0, 0, 1)", body.Style.GetBorderColor());
+            Assert.AreEqual("rgba(255, 0, 0, 1)", body.Style.GetBorderLeftColor());
+            Assert.AreEqual("rgba(255, 0, 0, 1)", body.Style.GetBorderRightColor());
+            Assert.AreEqual("rgba(255, 0, 0, 1)", body.Style.GetBorderTopColor());
+            Assert.AreEqual("rgba(255, 0, 0, 1)", body.Style.GetBorderBottomColor());
+        }
+
+        [Test]
+        public void CssStyleSheetShouldCollapseBorderColorCorrectly_Issue23()
+        {
+            var parser = new CssParser();
+            var source = "body { border-color: red }";
+            var sheet = parser.ParseStyleSheet(source);
+
+            var body = sheet.Rules[0] as ICssStyleRule;
+            body.Style.SetBorderLeftColor("blue");
+            body.Style.SetBorderRightColor("blue");
+            Assert.AreEqual("border-color: rgba(255, 0, 0, 1) rgba(0, 0, 255, 1)", body.Style.CssText);
+            Assert.AreEqual("rgba(255, 0, 0, 1) rgba(0, 0, 255, 1)", body.Style.GetBorderColor());
+            Assert.AreEqual("rgba(0, 0, 255, 1)", body.Style.GetBorderLeftColor());
+            Assert.AreEqual("rgba(0, 0, 255, 1)", body.Style.GetBorderRightColor());
+            Assert.AreEqual("rgba(255, 0, 0, 1)", body.Style.GetBorderTopColor());
+            Assert.AreEqual("rgba(255, 0, 0, 1)", body.Style.GetBorderBottomColor());
+        }
+
+        [Test]
+        public void CssStyleSheetShouldCollapseFullBorderCorrectly_Issue23()
+        {
+            var parser = new CssParser();
+            var source = "body { border: 1px  solid  red }";
+            var sheet = parser.ParseStyleSheet(source);
+
+            var body = sheet.Rules[0] as ICssStyleRule;
+            Assert.AreEqual("border: 1px solid rgba(255, 0, 0, 1)", body.Style.CssText);
+            body.Style.SetBorderLeftColor("blue");
+            body.Style.SetBorderTopWidth("medium");
+            Assert.AreEqual("border-top: 3px solid rgba(255, 0, 0, 1); border-right: 1px solid rgba(255, 0, 0, 1); border-bottom: 1px solid rgba(255, 0, 0, 1); border-left: 1px solid rgba(0, 0, 255, 1)", body.Style.CssText);
+            Assert.AreEqual("rgba(255, 0, 0, 1) rgba(255, 0, 0, 1) rgba(255, 0, 0, 1) rgba(0, 0, 255, 1)", body.Style.GetBorderColor());
+            Assert.AreEqual("3px 1px 1px", body.Style.GetBorderWidth());
+            Assert.AreEqual("solid", body.Style.GetBorderStyle());
+        }
+
         [Test]
         public void CssStyleSheetInsertShouldSetParentStyleSheetCorrectly()
         {

src/AngleSharp.Css/BrowsingContextExtensions.cs

@@ -63,7 +63,7 @@ internal static ICssProperty CreateShorthand(this IBrowsingContext context, Stri
         {
             var factory = context.GetFactory<IDeclarationFactory>();
             var info = factory.Create(name);
-            var value = info.Combine(factory, longhands);
+            var value = info.Collapse(factory, longhands);
 
             if (context.AllowsDeclaration(info))
             {
@@ -77,7 +77,7 @@ internal static ICssProperty[] CreateLonghands(this IBrowsingContext context, IC
         {
             var factory = context.GetFactory<IDeclarationFactory>();
             var info = factory.Create(shorthand.Name);
-            var values = info.Seperate(factory, shorthand.RawValue);
+            var values = info.Expand(factory, shorthand.RawValue);
             return factory.CreateProperties(info.Longhands, values, shorthand.IsImportant);
         }
 

src/AngleSharp.Css/Extensions/DeclarationInfoExtensions.cs

@@ -11,7 +11,7 @@ static class DeclarationInfoExtensions
         public static IEnumerable<String> GetMappings(this DeclarationInfo info) =>
             info.Longhands.Length > 0 ? info.Longhands : Enumerable.Repeat(info.Name, 1);
 
-        public static ICssValue Combine(this DeclarationInfo info, IDeclarationFactory factory, ICssValue[] longhands)
+        public static ICssValue Collapse(this DeclarationInfo info, IDeclarationFactory factory, ICssValue[] longhands)
         {
             var initial = true;
             var unset = true;
@@ -40,7 +40,7 @@ public static ICssValue Combine(this DeclarationInfo info, IDeclarationFactory f
             return info.Aggregator?.Merge(longhands);
         }
 
-        public static ICssValue[] Seperate(this DeclarationInfo info, IDeclarationFactory factory, ICssValue value)
+        public static ICssValue[] Expand(this DeclarationInfo info, IDeclarationFactory factory, ICssValue value)
         {
             var longhands = info.Longhands;