Merge remote-tracking branch 'origin/master' into implementation-root…

…-dictionary

ACadSharp.Tests/ColorTests.cs

@@ -1,20 +1,30 @@
-using System;
+using ACadSharp.Tests.Common;
+using System;
+using System.Drawing;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace ACadSharp.Tests
 {
 	public class ColorTests
 	{
+		private ITestOutputHelper _output;
+
+		public ColorTests(ITestOutputHelper output)
+		{
+			_output = output;
+		}
+
 		[Fact]
 		public void IndexedColorProperties()
 		{
 			Assert.True(new Color(0).IsByBlock);
 			Assert.True(new Color(256).IsByLayer);
-			
-			Assert.True(new Color(2705).IsTrueColor);
-			Assert.True(new Color(2706).IsTrueColor);
-			Assert.True(new Color(2707).IsTrueColor);
-			Assert.True(new Color(2708).IsTrueColor);
+
+			Assert.True(Color.FromTrueColor(2705).IsTrueColor);
+			Assert.True(Color.FromTrueColor(2706).IsTrueColor);
+			Assert.True(Color.FromTrueColor(2707).IsTrueColor);
+			Assert.True(Color.FromTrueColor(2708).IsTrueColor);
 		}
 
 		[Fact]
@@ -61,6 +71,50 @@ public void HandlesIndexedColors()
 			}
 		}
 
+		[Fact]
+		public void GetRgbTest()
+		{
+			CSMathRandom random = new CSMathRandom();
+
+			byte r = random.Next<byte>();
+			byte g = random.Next<byte>();
+			byte b = random.Next<byte>();
+
+			Color color = new Color(r, g, b);
+
+			this._output.WriteLine($"Color value: {color}");
+
+			var rgb = color.GetRgb();
+
+			Assert.Equal(r, rgb[0]);
+			Assert.Equal(g, rgb[1]);
+			Assert.Equal(b, rgb[2]);
+		}
+
+		[Fact]
+		public void ByLayerTest()
+		{
+			Color byLayer = Color.ByLayer;
+
+			this._output.WriteLine($"Color value: {byLayer}");
+
+			Assert.True(byLayer.IsByLayer);
+			Assert.False(byLayer.IsByBlock);
+			Assert.Equal(256, byLayer.Index);
+		}
+
+		[Fact]
+		public void ByBlockTest()
+		{
+			Color byBlock = Color.ByBlock;
+
+			this._output.WriteLine($"Color value: {byBlock}");
+
+			Assert.True(byBlock.IsByBlock);
+			Assert.False(byBlock.IsByLayer);
+			Assert.Equal(0, byBlock.Index);
+		}
+
 		private int int32FromInt24(byte[] array)
 		{
 			if (BitConverter.IsLittleEndian)

ACadSharp.Tests/Common/Factory.cs

@@ -58,7 +58,7 @@ private static CadObject createObject(Type type, Type original, bool randomize)
 				return null;
 			}
 
-			if (type == typeof(XRecrod)
+			if (type == typeof(XRecord)
 				|| type == typeof(PlotSettings)
 				|| type == typeof(Material)
 				|| type == typeof(MLStyle)