Refactored code.

mahara · Dec 11, 2023 · 4edbc28 · 4edbc28
1 parent edaf5c1
commit 4edbc28
Show file tree

Hide file tree

Showing 48 changed files with 787 additions and 649 deletions.
diff --git a/buildscripts/CommonAssemblyInfo.cs b/buildscripts/CommonAssemblyInfo.cs
@@ -1,5 +1,5 @@
 #region License
-// Copyright 2004-2024 Castle Project - https://www.castleproject.org/
+// Copyright 2004-2024 Castle Project - https://www.castleproject.org/x
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,6 @@
 // limitations under the License.
 #endregion
 
-using System;
-
 [assembly: CLSCompliant(true)]
 
 

diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/AbstractNHibernateTestCase.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/AbstractNHibernateTestCase.cs
@@ -78,7 +78,7 @@ public virtual void TearDown()
             OnTearDown();
             DropDatabaseSchemas();
             Container.Dispose();
-            Container = null;
+            Container = null!;
         }
 
         protected virtual void OnTearDown()

diff --git a/...cilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj b/...cilities.NHibernateIntegration.Tests/Castle.Facilities.NHibernateIntegration.Tests.csproj
@@ -16,27 +16,31 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core"  />
-    <PackageReference Include="Castle.Facilities.AutoTx"  />
-    <PackageReference Include="Castle.LoggingFacility"  />
-    <PackageReference Include="Castle.Services.Transaction"  />
-    <PackageReference Include="Castle.Windsor"  />
-    <PackageReference Include="LiquidTestReports.Markdown"  />
-    <PackageReference Include="Microsoft.NET.Test.Sdk"  />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel"  />
-    <PackageReference Include="Moq"  />
-    <PackageReference Include="Newtonsoft.Json"  />
-    <PackageReference Include="NHibernate"  />
-    <PackageReference Include="NUnit"  />
+    <PackageReference Include="Castle.Core" />
+    <PackageReference Include="Castle.Facilities.AutoTx" />
+    <PackageReference Include="Castle.LoggingFacility" />
+    <PackageReference Include="Castle.Services.Transaction" />
+    <PackageReference Include="Castle.Windsor" />
+    <PackageReference Include="LiquidTestReports.Markdown" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="NHibernate" />
+    <PackageReference Include="Nullable">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter"  />
-    <PackageReference Include="NUnitLite"  />
-    <PackageReference Include="NunitXml.TestLogger"  />
-    <PackageReference Include="System.Data.SqlClient"  />
-    <PackageReference Include="System.Text.Json"  />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="NUnitLite" />
+    <PackageReference Include="NunitXml.TestLogger" />
+    <PackageReference Include="System.Data.SqlClient" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net6.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />

diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Blog.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/Blog.cs
@@ -27,7 +27,7 @@ public Blog()
 
         public virtual int Id { get; set; }
 
-        public virtual string Name { get; set; }
+        public virtual string Name { get; set; } = string.Empty;
 
         public virtual IList<BlogItem> Items { get; set; }
     }

diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItem.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogItem.cs
@@ -22,11 +22,11 @@ public class BlogItem
     {
         public virtual int Id { get; set; }
 
-        public virtual Blog ParentBlog { get; set; }
+        public virtual Blog? ParentBlog { get; set; }
 
-        public virtual string Title { get; set; }
+        public virtual string Title { get; set; } = string.Empty;
 
-        public virtual string Text { get; set; }
+        public virtual string Text { get; set; } = string.Empty;
 
         public virtual DateTime DateTime { get; set; }
     }

diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRef.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/BlogRef.cs
@@ -20,8 +20,8 @@ public class BlogRef
     {
         public virtual int Id { get; set; }
 
-        public virtual Blog ParentBlog { get; set; }
+        public virtual Blog? ParentBlog { get; set; }
 
-        public virtual string Title { get; set; }
+        public virtual string Title { get; set; } = string.Empty;
     }
 }
diff --git a/src/Castle.Facilities.NHibernateIntegration.Tests/Common/TestInterceptor.cs b/src/Castle.Facilities.NHibernateIntegration.Tests/Common/TestInterceptor.cs
@@ -47,17 +47,17 @@ public void ResetState()
 
         #region IInterceptor Members
 
-        public override int[] FindDirty(object entity,
-                                        object id,
-                                        object[] currentState,
-                                        object[] previousState,
-                                        string[] propertyNames,
-                                        IType[] types)
+        public override int[]? FindDirty(object entity,
+                                         object id,
+                                         object[] currentState,
+                                         object[] previousState,
+                                         string[] propertyNames,
+                                         IType[] types)
         {
             return null;
         }
 
-        public override object Instantiate(string clazz, object id)
+        public override object? Instantiate(string clazz, object id)
         {
             _instantiationCall = true;