[Refactor] ModelInspector to use the implementation from ECoreNetto.Extensions

samatrhea · samatrhea · commit 65f64206089a · 2023-03-18T12:57:06.000+01:00
[Update] test dependencies
diff --git a/SySML2.NET.REST.Tests/SySML2.NET.REST.Tests.csproj b/SySML2.NET.REST.Tests/SySML2.NET.REST.Tests.csproj
@@ -17,10 +17,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit.Console" Version="3.16.2" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+		<PackageReference Include="NUnit.Console" Version="3.16.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
 
 		<PackageReference Include="coverlet.collector" Version="3.2.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/SysML2.NET.CodeGenerator.Tests/Inspector/ModelInspectorTestFixture.cs b/SysML2.NET.CodeGenerator.Tests/Inspector/ModelInspectorTestFixture.cs
@@ -21,15 +21,14 @@
 namespace SysML2.NET.CodeGenerator.Tests.Inspector
 {
     using System;
-    using System.Linq;
-
+    
     using ECoreNetto;
+    using ECoreNetto.Extensions;
 
     using NUnit.Framework;
 
     using SysML2.NET.CodeGenerator;
-    using SysML2.NET.CodeGenerator.Inspector;
-
+    
     /// <summary>
     /// Suite of tests for the <see cref="ModelInspector"/> class.
     /// </summary>
@@ -38,28 +37,44 @@ public class ModelInspectorTestFixture
     {
         private ModelInspector modelInspector;
 
+        private EPackage rootPackage;
+
         [SetUp]
         public void SetUp()
         {
+            this.rootPackage = DataModelLoader.Load();
+
             this.modelInspector = new ModelInspector();
         }
 
         [Test]
         public void Verify_that_inspects_executes_as_expected()
         {
-            Assert.That(() => this.modelInspector.Inspect(), Throws.Nothing);
+            var report = this.modelInspector.Inspect(this.rootPackage, true);
+
+            Assert.That(report, Is.Not.Empty);
+
+            Console.WriteLine(report);
         }
 
         [Test, TestCaseSource(typeof(Expected.ExpectedConcreteClasses)), Category("Expected")]
         public void Verify_that_inspect_class_executes_as_expected(string className)
         {
-            Assert.That(() => ModelInspector.Inspect(className), Throws.Nothing);
+            var report = this.modelInspector.Inspect(this.rootPackage, className);
+
+            Assert.That(report, Is.Not.Empty);
+
+            Console.WriteLine(report);
         }
 
         [Test]
         public void Verify_that_analyze_docs_executes_as_expected()
         {
-            Assert.That(ModelInspector.AnalyzeDocumentation, Throws.Nothing);
+            var report = this.modelInspector.AnalyzeDocumentation(this.rootPackage, true);
+
+            Assert.That(report, Is.Not.Empty);
+
+            Console.WriteLine(report);
         }
     }
 }
diff --git a/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj b/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj
@@ -349,10 +349,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit.Console" Version="3.16.2" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+		<PackageReference Include="NUnit.Console" Version="3.16.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
 
 		<PackageReference Include="coverlet.collector" Version="3.2.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/SysML2.NET.CodeGenerator/Inspector/ModelInspector.cs b/SysML2.NET.CodeGenerator/Inspector/ModelInspector.cs
diff --git a/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj b/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj
@@ -19,9 +19,9 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ECoreNetto.HandleBars" Version="0.6.0" />
+		<PackageReference Include="ECoreNetto.HandleBars" Version="1.0.0" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
-		<PackageReference Include="Microsoft.CodeAnalysis" Version="4.4.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis" Version="4.5.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/SysML2.NET.Dal.Tests/SysML2.NET.Dal.Tests.csproj b/SysML2.NET.Dal.Tests/SysML2.NET.Dal.Tests.csproj
@@ -17,10 +17,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit.Console" Version="3.16.2" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+		<PackageReference Include="NUnit.Console" Version="3.16.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
 
 		<PackageReference Include="coverlet.collector" Version="3.2.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/SysML2.NET.Serializer.Dictionary.Tests/SysML2.NET.Serializer.Dictionary.Tests.csproj b/SysML2.NET.Serializer.Dictionary.Tests/SysML2.NET.Serializer.Dictionary.Tests.csproj
@@ -17,10 +17,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit.Console" Version="3.16.2" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+		<PackageReference Include="NUnit.Console" Version="3.16.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
 
 		<PackageReference Include="coverlet.collector" Version="3.2.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/SysML2.NET.Serializer.Json.Tests/SysML2.NET.Serializer.Json.Tests.csproj b/SysML2.NET.Serializer.Json.Tests/SysML2.NET.Serializer.Json.Tests.csproj
@@ -17,10 +17,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit.Console" Version="3.16.2" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+		<PackageReference Include="NUnit.Console" Version="3.16.3" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
 
 		<PackageReference Include="coverlet.collector" Version="3.2.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/SysML2.NET.Viewer.Tests/SysML2.NET.Viewer.Tests.csproj b/SysML2.NET.Viewer.Tests/SysML2.NET.Viewer.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,14 @@`
`21`	`21`	`namespace SysML2.NET.CodeGenerator.Tests.Inspector`
`22`	`22`	`{`
`23`	`23`	`using System;`
`24`		`- using System.Linq;`
`25`		`-`
	`24`	`+`
`26`	`25`	`using ECoreNetto;`
	`26`	`+ using ECoreNetto.Extensions;`
`27`	`27`
`28`	`28`	`using NUnit.Framework;`
`29`	`29`
`30`	`30`	`using SysML2.NET.CodeGenerator;`
`31`		`- using SysML2.NET.CodeGenerator.Inspector;`
`32`		`-`
	`31`	`+`
`33`	`32`	`/// <summary>`
`34`	`33`	`/// Suite of tests for the <see cref="ModelInspector"/> class.`
`35`	`34`	`/// </summary>`
`@@ -38,28 +37,44 @@ public class ModelInspectorTestFixture`
`38`	`37`	`{`
`39`	`38`	`private ModelInspector modelInspector;`
`40`	`39`
	`40`	`+ private EPackage rootPackage;`
	`41`	`+`
`41`	`42`	`[SetUp]`
`42`	`43`	`public void SetUp()`
`43`	`44`	`{`
	`45`	`+ this.rootPackage = DataModelLoader.Load();`
	`46`	`+`
`44`	`47`	`this.modelInspector = new ModelInspector();`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`[Test]`
`48`	`51`	`public void Verify_that_inspects_executes_as_expected()`
`49`	`52`	`{`
`50`		`- Assert.That(() => this.modelInspector.Inspect(), Throws.Nothing);`
	`53`	`+ var report = this.modelInspector.Inspect(this.rootPackage, true);`
	`54`	`+`
	`55`	`+ Assert.That(report, Is.Not.Empty);`
	`56`	`+`
	`57`	`+ Console.WriteLine(report);`
`51`	`58`	`}`
`52`	`59`
`53`	`60`	`[Test, TestCaseSource(typeof(Expected.ExpectedConcreteClasses)), Category("Expected")]`
`54`	`61`	`public void Verify_that_inspect_class_executes_as_expected(string className)`
`55`	`62`	`{`
`56`		`- Assert.That(() => ModelInspector.Inspect(className), Throws.Nothing);`
	`63`	`+ var report = this.modelInspector.Inspect(this.rootPackage, className);`
	`64`	`+`
	`65`	`+ Assert.That(report, Is.Not.Empty);`
	`66`	`+`
	`67`	`+ Console.WriteLine(report);`
`57`	`68`	`}`
`58`	`69`
`59`	`70`	`[Test]`
`60`	`71`	`public void Verify_that_analyze_docs_executes_as_expected()`
`61`	`72`	`{`
`62`		`- Assert.That(ModelInspector.AnalyzeDocumentation, Throws.Nothing);`
	`73`	`+ var report = this.modelInspector.AnalyzeDocumentation(this.rootPackage, true);`
	`74`	`+`
	`75`	`+ Assert.That(report, Is.Not.Empty);`
	`76`	`+`
	`77`	`+ Console.WriteLine(report);`
`63`	`78`	`}`
`64`	`79`	`}`
`65`	`80`	`}`