Merge branch 'master' into master

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "netdocgen.runner": {
-      "version": "0.1.0",
+      "version": "0.1.1",
       "commands": [
         "netdocgen"
       ],

.github/workflows/coveralls.yml

@@ -0,0 +1,35 @@
+name: Coveralls
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  SAMPLES_FOLDER: "../../../../samples"
+  OUTPUT_SAMPLES_FOLDER: "../../../../samples/out"
+  OUTPUT_SINGLE_CASES_FOLDER: "../../../../samples/out/single_cases"
+  LOCAL_ENV: "false"
+  DELTA: "0.00001"
+  DECIMAL_PRECISION: "5"
+  RUN_DWG_WRITER_SINGLE_CASES_TEST: "false"
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+      with: 
+        submodules: true
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test -p:CollectCoverage=true -p:CoverletOutput=TestResults/ -p:CoverletOutputFormat=lcov --no-build --verbosity normal ACadSharp.Tests/
+    - name: Coveralls action
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ github.token }}
+        path-to-lcov: ACadSharp.Tests/TestResults/coverage.info 

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "CSUtilities"]
 	path = CSUtilities
 	url = https://github.com/DomCR/CSUtilities
-[submodule "wiki"]
-	path = wiki
-	url = https://github.com/DomCR/ACadSharp.wiki.git

ACadSharp.Tests/ACadSharp.Tests.csproj

@@ -12,10 +12,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.*" />
     <PackageReference Include="MSTest.TestFramework" Version="3.*" />
-    <PackageReference Include="coverlet.collector" Version="6.*">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

ACadSharp.Tests/CadDocumentTests.cs

@@ -5,6 +5,7 @@
 using ACadSharp.Entities;
 using Xunit.Abstractions;
 using ACadSharp.Blocks;
+using System.Linq;
 
 namespace ACadSharp.Tests
 {
@@ -50,6 +51,11 @@ public void CadDocumentDefaultTest()
 			this._docIntegrity.AssertDocumentDefaults(doc);
 			this._docIntegrity.AssertTableHirearchy(doc);
 			this._docIntegrity.AssertBlockRecords(doc);
+
+			Assert.Equal(2, doc.BlockRecords.Count);
+			Assert.Equal(1, doc.Layers.Count);
+			Assert.Equal(3, doc.LineTypes.Count);
+			Assert.Equal(2, doc.Layouts.Count());
 		}
 
 		[Fact]

ACadSharp.Tests/Common/DocumentIntegrity.cs

@@ -59,8 +59,10 @@ public void AssertDocumentDefaults(CadDocument doc)
 			this.entryNotNull(doc.VPorts, "*Active");
 
 			//Assert Model layout
-			var layout = doc.Layouts.FirstOrDefault(l => l.Name == Layout.LayoutModelName);
+			var layout = doc.Layouts.FirstOrDefault(l => l.Name == Layout.ModelLayoutName);
+
 			this.notNull(layout, "Layout Model is null");
+
 			Assert.True(layout.AssociatedBlock == doc.ModelSpace);
 		}
 

ACadSharp.Tests/Entities/EntityTests.cs

@@ -22,6 +22,15 @@ static EntityTests()
 			}
 		}
 
+		[Theory]
+		[MemberData(nameof(EntityTypes))]
+		public void BoundingBoxTest(Type entityType)
+		{
+			Entity entity = EntityFactory.Create(entityType);
+
+			entity.GetBoundingBox();
+		}
+
 		[Theory]
 		[MemberData(nameof(EntityTypes))]
 		public void Clone(Type entityType)

ACadSharp.Tests/IO/CadReaderTestsBase.cs

@@ -1,16 +1,14 @@
-using ACadSharp.Entities;
-using ACadSharp.Header;
+using ACadSharp.Header;
 using ACadSharp.IO;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace ACadSharp.Tests.IO
 {
 	public abstract class CadReaderTestsBase<T> : IOTestsBase, IDisposable
-		where T : CadReaderBase
+		where T : ICadReader
 	{
 		protected readonly Dictionary<string, CadDocument> _documents = new Dictionary<string, CadDocument>();  //TODO: this does not store the document readed
 
@@ -38,6 +36,8 @@ public virtual void AssertDocumentDefaults(string test)
 		{
 			CadDocument doc = this.getDocument(test);
 
+			Assert.NotNull(doc.SummaryInfo);
+
 			if (doc.Header.Version < ACadVersion.AC1012)
 			{
 				//Older version do not keep the handles for tables and other objects like block_records

ACadSharp.Tests/IO/DWG/DwgWriterSingleObjectTests.cs

@@ -45,7 +45,7 @@ protected virtual void writeDwgFile(SingleCaseGenerator data, ACadVersion versio
 			string path = this.getPath(data.Name, "dwg", version);
 
 			data.Document.Header.Version = version;
-			DwgWriter.Write(path, data.Document, this.onNotification);
+			DwgWriter.Write(path, data.Document, notification: this.onNotification);
 		}
 	}
 }

ACadSharp.Tests/IO/IOTests.cs

@@ -56,7 +56,7 @@ public void DxfToDxf(string test)
 		{
 			CadDocument doc = DxfReader.Read(test);
 
-			if(doc.Header.Version < ACadVersion.AC1012)
+			if (doc.Header.Version < ACadVersion.AC1012)
 			{
 				return;
 			}

ACadSharp.Tests/IO/LocalSampleTests.cs

@@ -50,7 +50,6 @@ public void ReadUserDxf(string test)
 			}
 		}
 
-
 		[Theory]
 		[MemberData(nameof(StressFiles))]
 		public void ReadStressFiles(string test)

ACadSharp.Tests/IO/WriterSingleObjectTests.cs

@@ -176,6 +176,40 @@ public void SingleRasterImage()
 				this.Document.Entities.Add(raster);
 			}
 
+			public void CreateLayout()
+			{
+				//Draw a cross in the model
+				this.Document.Entities.Add(new Line(XYZ.Zero, new XYZ(100, 100, 0)));
+				this.Document.Entities.Add(new Line(new XYZ(0, 100, 0), new XYZ(100, 0, 0)));
+
+				Layout layout = new Layout("my_layout");
+
+				this.Document.Layouts.Add(layout);
+			}
+
+			public void LineTypeWithSegments()
+			{
+				LineType lt = new LineType("segmented");
+				lt.Description = "hello";
+
+				LineType.Segment s1 = new LineType.Segment
+				{
+					Length = 12,
+					//Style = this.Document.TextStyles[TextStyle.DefaultName]
+				};
+
+				LineType.Segment s2 = new LineType.Segment
+				{
+					Length = -3,
+					//Style = this.Document.TextStyles[TextStyle.DefaultName]
+				};
+
+				lt.AddSegment(s1);
+				lt.AddSegment(s2);
+
+				this.Document.LineTypes.Add(lt);
+			}
+
 			public void ClosedLwPolyline()
 			{
 				List<LwPolyline.Vertex> vertices = new List<LwPolyline.Vertex>() {
@@ -208,12 +242,21 @@ public void ClosedPolyline2DTest()
 					new Vertex2D() { Location = new XYZ(4, 4, 0) }
 				};
 
-				var Pline = new Polyline2D();
-				Pline.Vertices.AddRange(vector2d);
-				Pline.IsClosed = true;
-				Pline.Vertices.ElementAt(3).Bulge = 1;
+				var pline = new Polyline2D();
+				pline.Vertices.AddRange(vector2d);
+				pline.IsClosed = true;
+				pline.Vertices.ElementAt(3).Bulge = 1;
+
+				this.Document.Entities.Add(pline);
+			}
 
-				this.Document.Entities.Add(Pline);
+			public void EntityTransparency()
+			{
+				Line line = new Line(XYZ.Zero, new XYZ(100, 100, 0));
+
+				line.Transparency = new Transparency(50);
+
+				this.Document.Entities.Add(line);
 			}
 
 			public void Deserialize(IXunitSerializationInfo info)
@@ -257,6 +300,9 @@ static WriterSingleObjectTests()
 			Data.Add(new(nameof(SingleCaseGenerator.ClosedPolyline2DTest)));
 			Data.Add(new(nameof(SingleCaseGenerator.SingleRasterImage)));
 			Data.Add(new(nameof(SingleCaseGenerator.SingleWipeout)));
+			Data.Add(new(nameof(SingleCaseGenerator.CreateLayout)));
+			Data.Add(new(nameof(SingleCaseGenerator.EntityTransparency)));
+			Data.Add(new(nameof(SingleCaseGenerator.LineTypeWithSegments)));
 		}
 
 		protected string getPath(string name, string ext, ACadVersion version)

ACadSharp.Tests/Objects/CadDictionaryTests.cs

@@ -16,9 +16,25 @@ public void AvoidDuplicatedEntries()
 			cadDictionary.Add(scale);
 
 			Scale scale1 = new Scale();
+			scale1.Name = "scale_test";
+
+			Assert.Throws<ArgumentException>(() => cadDictionary.Add(scale1));
+
+			scale.Name = "changed_name";
+			scale1.Name = "changed_name";
+
+			Assert.Throws<ArgumentException>(() => cadDictionary.Add(scale1));
+		}
+
+		[Fact]
+		public void TryAddTest()
+		{
+			CadDictionary cadDictionary = new CadDictionary();
+			Scale scale = new Scale();
 			scale.Name = "scale_test";
 
-			Assert.Throws<ArgumentException>(() => cadDictionary.Add(scale));
+			Assert.True(cadDictionary.TryAdd(scale));
+			Assert.False(cadDictionary.TryAdd(scale));
 		}
 	}
 }

ACadSharp.Tests/Objects/Collections/ScaleCollectionTests.cs

@@ -4,7 +4,7 @@ namespace ACadSharp.Tests.Objects.Collections
 {
 	public class ScaleCollectionTests
 	{
-		[Fact(Skip = "test needed for root dictionary")]
+		[Fact]
 		public void InitScaleCollection()
 		{
 			CadDocument doc = new CadDocument();

ACadSharp.Tests/Objects/LayoutTests.cs

@@ -0,0 +1,67 @@
+using ACadSharp.Objects;
+using System;
+using System.Linq;
+using Xunit;
+
+namespace ACadSharp.Tests.Objects
+{
+	public class LayoutTests
+	{
+		[Fact]
+		public void AddLayout()
+		{
+			CadDocument document = new CadDocument();
+
+			string layoutName = "my_layout";
+			Layout layout = new Layout(layoutName);
+
+			document.Layouts.Add(layout);
+
+			Assert.Equal(layoutName, layout.AssociatedBlock.Name);
+			Assert.Equal(3, document.Layouts.Count());
+			Assert.True(document.BlockRecords.Contains(layoutName));
+		}
+
+		[Fact]
+		public void RemoveBlockRecordTest()
+		{
+			var document = new CadDocument();
+
+			string layoutName = "my_layout";
+			Layout layout = new Layout(layoutName);
+
+			document.Layouts.Add(layout);
+
+			document.BlockRecords.Remove(layoutName);
+
+			Assert.Equal(2, document.Layouts.Count());
+			Assert.False(document.Layouts.ContainsKey(layoutName));
+			Assert.False(document.BlockRecords.Contains(layoutName));
+		}
+
+		[Fact]
+		public void RemoveTest()
+		{
+			var document = new CadDocument();
+
+			string layoutName = "my_layout";
+			Layout layout = new Layout(layoutName);
+
+			document.Layouts.Add(layout);
+
+			Assert.True(document.Layouts.Remove(layoutName));
+			Assert.Equal(2, document.Layouts.Count());
+			Assert.True(document.BlockRecords.Contains(layoutName));
+			Assert.NotEqual(document.BlockRecords[layoutName], layout.AssociatedBlock);
+		}
+
+		[Fact]
+		public void CannotRemoveDefaultLayouts()
+		{
+			var document = new CadDocument();
+
+			Assert.Throws<ArgumentException>(() => document.Layouts.Remove(Layout.ModelLayoutName));
+			Assert.Throws<ArgumentException>(() => document.Layouts.Remove(Layout.PaperLayoutName));
+		}
+	}
+}

ACadSharp.sln

@@ -38,6 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 		.github\workflows\build.yml = .github\workflows\build.yml
 		.github\workflows\build_n_test.yml = .github\workflows\build_n_test.yml
 		publish.yml = publish.yml
+		.github\workflows\coveralls.yml = .github\workflows\coveralls.yml
 		.github\workflows\wiki-gen.yml = .github\workflows\wiki-gen.yml
 	EndProjectSection
 EndProject

ACadSharp/ACadSharp.csproj

@@ -17,7 +17,7 @@
 	<PropertyGroup>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<Version>2.3.2-beta</Version>
+		<Version>2.4.0-beta</Version>
 	</PropertyGroup>
 
 	<Import Project="..\CSUtilities\CSMath\CSMath.projitems" Label="Shared" />