Merge pull request #156 from lee-m/colour-parsing-fixes

Couple of colour parsing fixes/tweaks

Author: TylerBrinks

src/ExCSS.Tests/PropertyTests/BackgroundProperty.cs

@@ -144,60 +144,25 @@ public void BackgroundColorTealLegal()
             Assert.Equal("rgb(0, 128, 128)", concrete.Value);
         }
 
-        [Fact]
-        public void BackgroundColorRgbLegal()
-        {
-            var snippet = "background-color : rgb(255  ,  255  ,  128)";
-            var property = ParseDeclaration(snippet);
-            Assert.Equal("background-color", property.Name);
-            Assert.False(property.IsImportant);
-            Assert.IsType<BackgroundColorProperty>(property);
-            var concrete = (BackgroundColorProperty)property;
-            Assert.False(concrete.IsInherited);
-            Assert.True(concrete.HasValue);
-            Assert.Equal("rgb(255, 255, 128)", concrete.Value);
-        }
-
-        [Fact]
-        public void BackgroundColorHslaLegal()
-        {
-            var snippet = "background-color : hsla(50, 33%, 25%, 0.75)";//equal to rgba(85, 78, 43, 0.75)
-            var property = ParseDeclaration(snippet);
-            Assert.Equal("background-color", property.Name);
-            Assert.False(property.IsImportant);
-            Assert.IsType<BackgroundColorProperty>(property);
-            var concrete = (BackgroundColorProperty)property;
-            Assert.False(concrete.IsInherited);
-            Assert.True(concrete.HasValue);
-            Assert.Equal("hsla(50deg, 33%, 25%, 0.75)", concrete.Value);
-        }
-
-        [Fact]
-        public void BackgroundColorTransparentLegal()
-        {
-            var snippet = "background-color : Transparent";
-            var property = ParseDeclaration(snippet);
-            Assert.Equal("background-color", property.Name);
-            Assert.False(property.IsImportant);
-            Assert.IsType<BackgroundColorProperty>(property);
-            var concrete = (BackgroundColorProperty)property;
-            Assert.False(concrete.IsInherited);
-            Assert.True(concrete.HasValue);
-            Assert.Equal("rgba(0, 0, 0, 0)", concrete.Value);
-        }
-
-        [Fact]
-        public void BackgroundColorHexLegal()
+        [Theory]
+        [InlineData("background-color: rgb(255, 255, 128)", "rgb(255, 255, 128)")]
+        [InlineData("background-color: hsla(50, 33%, 25%, 0.75)", "hsla(50deg, 33%, 25%, 0.75)")]
+        [InlineData("background-color : rgb(255  ,  255  ,  128)", "rgb(255, 255, 128)")]
+        [InlineData("background-color: Transparent", "rgba(0, 0, 0, 0)")]
+        [InlineData("background-color: #F09", "rgb(255, 0, 153)")]
+        [InlineData("background-color: #F09F", "rgb(255, 0, 153)")]
+        [InlineData("background-color: #AABBCC", "rgb(170, 187, 204)")]
+        [InlineData("background-color: #AABBCC11", "rgba(170, 187, 204, 0.07)")]
+        public void BackgroundColorRgbLegal(string snippet, string expectedValue)
         {
-            var snippet = "background-color : #bbff00";
             var property = ParseDeclaration(snippet);
             Assert.Equal("background-color", property.Name);
             Assert.False(property.IsImportant);
             Assert.IsType<BackgroundColorProperty>(property);
             var concrete = (BackgroundColorProperty)property;
             Assert.False(concrete.IsInherited);
             Assert.True(concrete.HasValue);
-            Assert.Equal("rgb(187, 255, 0)", concrete.Value);
+            Assert.Equal(expectedValue, concrete.Value);
         }
 
         [Fact]

src/ExCSS/Tokens/ColorToken.cs

@@ -7,7 +7,7 @@ public ColorToken(string data, TextPosition position)
         {
         }
 
-        public bool IsValid => Data.Length != 3 && Data.Length != 6;
+        public bool IsValid => Data.Length != 3 && Data.Length != 4 && Data.Length != 6 && Data.Length != 8;
 
         public override string ToValue()
         {

src/ExCSS/Values/Color.cs

@@ -270,7 +270,7 @@ public static Color FromHwba(float hue, float whiteness, float blackness, float
 
         public int Value => _hashcode;
         public byte A => _alpha;
-        public double Alpha => _alpha / 255.0;
+        public double Alpha => Math.Round(_alpha / 255.0, 2);
         public byte R => _red;
         public byte G => _green;
         public byte B => _blue;