From 6e8748b64832219184ff1d1ad558cc416ba6c162 Mon Sep 17 00:00:00 2001
From: Claudio Benghi <claudio.benghi@gmail.com>
Date: Sat, 27 Apr 2024 11:15:03 +0200
Subject: [PATCH] Added IFC structure testing.

---
 ids-lib/LibraryInformation.cs         |  2 +-
 ids-lib/ids-lib.csproj                |  2 +-
 ids-tool.tests/Helpers/XbimFixture.cs | 73 +++++++++++++++++++++++++++
 ids-tool.tests/IfcFilesTests.cs       | 24 +++++++--
 ids-tool.tests/ids-tool.tests.csproj  |  2 +-
 ids-tool/ids-tool.csproj              |  2 +-
 6 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 ids-tool.tests/Helpers/XbimFixture.cs

diff --git a/ids-lib/LibraryInformation.cs b/ids-lib/LibraryInformation.cs
index c3bc9dc..2139705 100644
--- a/ids-lib/LibraryInformation.cs
+++ b/ids-lib/LibraryInformation.cs
@@ -26,5 +26,5 @@ public static class LibraryInformation
 	/// <summary>
 	/// Static field with hardcoded DLL version number. 
 	/// </summary>
-	public static string AssemblyVersion => "1.0.72";
+	public static string AssemblyVersion => "1.0.73";
 }
diff --git a/ids-lib/ids-lib.csproj b/ids-lib/ids-lib.csproj
index 18e9a42..56ea1c0 100644
--- a/ids-lib/ids-lib.csproj
+++ b/ids-lib/ids-lib.csproj
@@ -20,7 +20,7 @@
 		<PackageReleaseNotes>First implementation.</PackageReleaseNotes>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<!-- Github actions are setup so that when this version is bumped the nuget package is uploaded -->
-		<AssemblyVersion>1.0.72</AssemblyVersion>
+		<AssemblyVersion>1.0.73</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/ids-tool.tests/Helpers/XbimFixture.cs b/ids-tool.tests/Helpers/XbimFixture.cs
new file mode 100644
index 0000000..1382a57
--- /dev/null
+++ b/ids-tool.tests/Helpers/XbimFixture.cs
@@ -0,0 +1,73 @@
+using idsTool.tests.Helpers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NSubstitute;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xbim.Common.Configuration;
+using Xunit;
+using static idsTool.tests.IfcFilesTests;
+
+namespace idsTool.tests.Helpers
+{
+	
+	public class XbimFixture : IDisposable
+	{
+		public ILogger<XbimFixture> Logger {  get; }
+
+		public  XbimFixture() 
+		{
+			// ... initialize xbim context ...
+			Logger = Substitute.For<ILogger<XbimFixture>>();
+
+			XbimServices.Current.ConfigureServices(s =>
+				s.AddXbimToolkit(opt => opt.AddMemoryModel())
+				.AddLogging(c => configure(c, Logger))
+			);
+		}
+		private void configure(ILoggingBuilder loggingBuilder, ILogger<XbimFixture> lg)
+		{
+			loggingBuilder.AddProvider(new MyLoggerProvider(lg));
+		}
+
+		public void Dispose()
+		{
+			// ... clean up test data from the database ...
+		}
+	}
+
+
+	public class MyLoggerProvider : ILoggerProvider
+	{
+		ILogger ret;
+
+		public MyLoggerProvider(ILogger val)
+		{
+			ret = val;
+		}
+
+		public void Dispose()
+		{
+			// Dispose any resources if needed
+		}
+
+		public ILogger CreateLogger(string categoryName)
+		{
+			return ret;
+		}
+	}
+
+
+
+	[CollectionDefinition("xbim collection")]
+	public class DatabaseCollection : ICollectionFixture<XbimFixture>
+	{
+		// This class has no code, and is never created. Its purpose is simply
+		// to be the place to apply [CollectionDefinition] and all the
+		// ICollectionFixture<> interfaces.
+	}
+
+}
diff --git a/ids-tool.tests/IfcFilesTests.cs b/ids-tool.tests/IfcFilesTests.cs
index 93719f0..755037a 100644
--- a/ids-tool.tests/IfcFilesTests.cs
+++ b/ids-tool.tests/IfcFilesTests.cs
@@ -1,24 +1,35 @@
 using FluentAssertions;
+using FluentAssertions.Common;
 using idsTool.tests.Helpers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NSubstitute;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Xbim.Common.Configuration;
 using Xbim.Ifc;
 using Xbim.Ifc4.Interfaces;
+using Xbim.IO.Parser;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace idsTool.tests
 {
-	public class IfcFilesTests : BuildingSmartRepoFiles
+	[Collection("Database collection")]
+
+	public class IfcFilesTests : BuildingSmartRepoFiles, IClassFixture<XbimFixture>
 	{
-		public IfcFilesTests(ITestOutputHelper outputHelper)
+		XbimFixture xbimContext;
+		public IfcFilesTests(XbimFixture fixture, ITestOutputHelper outputHelper)
 		{
-			XunitOutputHelper = outputHelper;
+			xbimContext = fixture;
+			XunitOutputHelper = outputHelper;		
 		}
+
 		private ITestOutputHelper XunitOutputHelper { get; }
 
 		[SkippableTheory]
@@ -38,10 +49,17 @@ public void IfcFileIsOk(string developmentIfcFile)
 				];
 
 			XunitOutputHelper.WriteLine($"Opening file `{ifcFile.FullName}`");
+			xbimContext.Logger.ClearReceivedCalls();
 			using var store = IfcStore.Open(ifcFile.FullName);
 			TestPredefinedType(store, musthave.Contains(ifcFile.Name));
+			if (ifcFile.Name == "bad.ifc")
+				xbimContext.Logger.ReceivedWithAnyArgs(1).Log(default, default);
+			else
+				xbimContext.Logger.ReceivedWithAnyArgs(0).Log(default, default);
 		}
 
+		
+
 		private void TestPredefinedType(IfcStore store, bool mustHaveObjType)
 		{
 			var toTest = store.Instances.OfType<IIfcObject>().ToList();
diff --git a/ids-tool.tests/ids-tool.tests.csproj b/ids-tool.tests/ids-tool.tests.csproj
index 92e8663..478813b 100644
--- a/ids-tool.tests/ids-tool.tests.csproj
+++ b/ids-tool.tests/ids-tool.tests.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<IsPackable>false</IsPackable>
 		<IsPublishable>false</IsPublishable>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<RootNamespace>idsTool.tests</RootNamespace>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>
diff --git a/ids-tool/ids-tool.csproj b/ids-tool/ids-tool.csproj
index 7d5b834..310849a 100644
--- a/ids-tool/ids-tool.csproj
+++ b/ids-tool/ids-tool.csproj
@@ -16,7 +16,7 @@
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageTags>IDS, buildingSmart</PackageTags>
 		<!-- Github actions are setup so that when this version is bumped the nuget package is uploaded -->
-		<AssemblyVersion>1.0.72</AssemblyVersion>
+		<AssemblyVersion>1.0.73</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<RepositoryUrl>https://github.com/buildingSMART/IDS-Audit-tool.git</RepositoryUrl>