-
Show Example
-
${Format(content)}
+
\ No newline at end of file
diff --git a/tools/docu/templates/!namespace/_fields.spark b/build/docu/templates/!namespace/_fields.spark
similarity index 100%
rename from tools/docu/templates/!namespace/_fields.spark
rename to build/docu/templates/!namespace/_fields.spark
diff --git a/tools/docu/templates/!namespace/_methods.spark b/build/docu/templates/!namespace/_methods.spark
similarity index 100%
rename from tools/docu/templates/!namespace/_methods.spark
rename to build/docu/templates/!namespace/_methods.spark
diff --git a/tools/docu/templates/!namespace/_namespaces.spark b/build/docu/templates/!namespace/_namespaces.spark
similarity index 100%
rename from tools/docu/templates/!namespace/_namespaces.spark
rename to build/docu/templates/!namespace/_namespaces.spark
diff --git a/tools/docu/templates/!namespace/_properties.spark b/build/docu/templates/!namespace/_properties.spark
similarity index 100%
rename from tools/docu/templates/!namespace/_properties.spark
rename to build/docu/templates/!namespace/_properties.spark
diff --git a/tools/docu/templates/!namespace/_remarks.spark b/build/docu/templates/!namespace/_remarks.spark
similarity index 100%
rename from tools/docu/templates/!namespace/_remarks.spark
rename to build/docu/templates/!namespace/_remarks.spark
diff --git a/tools/docu/templates/!namespace/_types.spark b/build/docu/templates/!namespace/_types.spark
similarity index 100%
rename from tools/docu/templates/!namespace/_types.spark
rename to build/docu/templates/!namespace/_types.spark
diff --git a/tools/docu/templates/!namespace/_value.spark b/build/docu/templates/!namespace/_value.spark
similarity index 100%
rename from tools/docu/templates/!namespace/_value.spark
rename to build/docu/templates/!namespace/_value.spark
diff --git a/tools/docu/templates/!namespace/index.htm.spark b/build/docu/templates/!namespace/index.htm.spark
similarity index 100%
rename from tools/docu/templates/!namespace/index.htm.spark
rename to build/docu/templates/!namespace/index.htm.spark
diff --git a/tools/docu/templates/_footer.spark b/build/docu/templates/_footer.spark
similarity index 100%
rename from tools/docu/templates/_footer.spark
rename to build/docu/templates/_footer.spark
diff --git a/tools/docu/templates/_namespaces.spark b/build/docu/templates/_namespaces.spark
similarity index 100%
rename from tools/docu/templates/_namespaces.spark
rename to build/docu/templates/_namespaces.spark
diff --git a/tools/docu/templates/_types.spark b/build/docu/templates/_types.spark
similarity index 100%
rename from tools/docu/templates/_types.spark
rename to build/docu/templates/_types.spark
diff --git a/tools/docu/templates/index.htm.spark b/build/docu/templates/index.htm.spark
similarity index 100%
rename from tools/docu/templates/index.htm.spark
rename to build/docu/templates/index.htm.spark
diff --git a/tools/docu/templates/js/example.js b/build/docu/templates/js/example.js
similarity index 96%
rename from tools/docu/templates/js/example.js
rename to build/docu/templates/js/example.js
index f805c21cc..f1cb6dc7b 100644
--- a/tools/docu/templates/js/example.js
+++ b/build/docu/templates/js/example.js
@@ -1,21 +1,21 @@
-$(document).ready(function() {
- $('div.example').each(function(i, div) {
- var a = $('a', div);
- var pre = $('pre', div);
-
- a.pre = pre;
- a.preVisible = false;
- pre.hide();
- a.click(function() {
- if (a.preVisible) {
- a.pre.hide();
- a.text('Show Example');
- a.preVisible = false;
- } else {
- a.pre.show();
- a.text('Hide Example');
- a.preVisible = true;
- }
- });
- });
+$(document).ready(function() {
+ $('div.example').each(function(i, div) {
+ var a = $('a', div);
+ var pre = $('pre', div);
+
+ a.pre = pre;
+ a.preVisible = false;
+ pre.hide();
+ a.click(function() {
+ if (a.preVisible) {
+ a.pre.hide();
+ a.text('Show Example');
+ a.preVisible = false;
+ } else {
+ a.pre.show();
+ a.text('Hide Example');
+ a.preVisible = true;
+ }
+ });
+ });
});
\ No newline at end of file
diff --git a/tools/docu/templates/js/jquery-1.3.2.min.js b/build/docu/templates/js/jquery-1.3.2.min.js
similarity index 100%
rename from tools/docu/templates/js/jquery-1.3.2.min.js
rename to build/docu/templates/js/jquery-1.3.2.min.js
diff --git a/tools/docu/templates/js/jquery.scrollTo-min.js b/build/docu/templates/js/jquery.scrollTo-min.js
similarity index 100%
rename from tools/docu/templates/js/jquery.scrollTo-min.js
rename to build/docu/templates/js/jquery.scrollTo-min.js
diff --git a/tools/docu/templates/js/navigation.js b/build/docu/templates/js/navigation.js
similarity index 100%
rename from tools/docu/templates/js/navigation.js
rename to build/docu/templates/js/navigation.js
diff --git a/tools/docu/templates/main.css b/build/docu/templates/main.css
similarity index 100%
rename from tools/docu/templates/main.css
rename to build/docu/templates/main.css
diff --git a/build/parameters.cake b/build/parameters.cake
new file mode 100644
index 000000000..5284879af
--- /dev/null
+++ b/build/parameters.cake
@@ -0,0 +1,81 @@
+#load "./paths.cake"
+#load "./version.cake"
+#load "./credentials.cake"
+
+public class BuildParameters
+{
+ public string Target { get; private set; }
+ public string Configuration { get; private set; }
+ public bool IsLocalBuild { get; private set; }
+ public bool IsRunningOnWindows { get; private set; }
+ public bool IsRunningOnAppVeyor { get; private set; }
+ public bool IsPullRequest { get; private set; }
+ public bool IsMainRepo { get; private set; }
+ public bool IsMainBranch { get; private set; }
+ public bool IsTagged { get; private set; }
+ public bool IsPublishBuild { get; private set; }
+ public bool IsReleaseBuild { get; private set; }
+ public ReleaseNotes ReleaseNotes { get; private set; }
+ public BuildGitHub GitHub { get; private set; }
+ public BuildNuGet NuGet { get; private set; }
+ public BuildVersion Version { get; private set; }
+ public BuildPaths Paths { get; private set; }
+
+ public bool ShouldPublish =>
+ !IsLocalBuild &&
+ !IsPullRequest &&
+ IsMainRepo &&
+ IsMainBranch &&
+ IsTagged;
+
+ public void Initialize(ICakeContext context)
+ {
+ Version = BuildVersion.Calculate(context, this);
+
+ Paths = BuildPaths.GetPaths(context, Configuration, Version.SemVersion);
+ }
+
+ public static BuildParameters GetParameters(ICakeContext context)
+ {
+ if (context == null)
+ {
+ throw new ArgumentNullException("context");
+ }
+
+ var target = context.Argument("target", "Default");
+ var buildSystem = context.BuildSystem();
+
+ return new BuildParameters {
+ Target = target,
+ Configuration = context.Argument("configuration", "Release"),
+ IsLocalBuild = buildSystem.IsLocalBuild,
+ IsRunningOnWindows = context.IsRunningOnWindows(),
+ IsRunningOnAppVeyor = buildSystem.AppVeyor.IsRunningOnAppVeyor,
+ IsPullRequest = buildSystem.AppVeyor.Environment.PullRequest.IsPullRequest,
+ IsMainRepo = StringComparer.OrdinalIgnoreCase.Equals("jagregory/fluent-hibernate", buildSystem.AppVeyor.Environment.Repository.Name),
+ IsMainBranch = StringComparer.OrdinalIgnoreCase.Equals("master", buildSystem.AppVeyor.Environment.Repository.Branch),
+ IsTagged = IsBuildTagged(buildSystem),
+ GitHub = BuildGitHub.GetWithCredentials(context, "jagregory", "fluent-nhibernate"),
+ NuGet = BuildNuGet.GetWithCredentials(context),
+ ReleaseNotes = context.ParseReleaseNotes("./ReleaseNotes.md"),
+ IsPublishBuild = IsPublishing(target),
+ IsReleaseBuild = IsReleasing(target)
+ };
+ }
+
+ private static bool IsBuildTagged(BuildSystem buildSystem) =>
+ buildSystem.AppVeyor.Environment.Repository.Tag.IsTag &&
+ !string.IsNullOrWhiteSpace(buildSystem.AppVeyor.Environment.Repository.Tag.Name);
+
+ private static bool IsReleasing(string target)
+ {
+ var targets = new [] { "Publish", "Publish-NuGet", "Publish-GitHub-Release" };
+ return targets.Any(t => StringComparer.OrdinalIgnoreCase.Equals(t, target));
+ }
+
+ private static bool IsPublishing(string target)
+ {
+ var targets = new [] { "Release-Notes", "Create-Release-Notes" };
+ return targets.Any(t => StringComparer.OrdinalIgnoreCase.Equals(t, target));
+ }
+}
diff --git a/build/paths.cake b/build/paths.cake
new file mode 100644
index 000000000..459911e35
--- /dev/null
+++ b/build/paths.cake
@@ -0,0 +1,99 @@
+public class BuildPaths
+{
+ public BuildFiles Files { get; private set; }
+ public BuildDirectories Directories { get; private set; }
+
+ public static BuildPaths GetPaths(
+ ICakeContext context,
+ string configuration,
+ string semVersion)
+ {
+ if (context == null)
+ {
+ throw new ArgumentNullException("context");
+ }
+ if (string.IsNullOrEmpty(configuration))
+ {
+ throw new ArgumentNullException("configuration");
+ }
+ if (string.IsNullOrEmpty(semVersion))
+ {
+ throw new ArgumentNullException("semVersion");
+ }
+
+ var artifactsDir = (DirectoryPath)(context.Directory("./artifacts") + context.Directory("v" + semVersion));
+ var artifactsBinDir = artifactsDir.Combine("bin");
+ var artifactsBinFullFx = artifactsBinDir.Combine("net461");
+ var testResultsDir = artifactsDir.Combine("test-results");
+ var nuspecRoot = (DirectoryPath)"nuspec";
+ var nugetRoot = artifactsDir.Combine("nuget");
+
+ var zipArtifactPathDesktop = artifactsDir.CombineWithFilePath($"FluentHibernate-net461-v{semVersion}.zip");
+
+ // Directories
+ var buildDirectories = new BuildDirectories(
+ artifactsDir,
+ testResultsDir,
+ nuspecRoot,
+ nugetRoot,
+ artifactsBinDir,
+ artifactsBinFullFx);
+
+ // Files
+ var buildFiles = new BuildFiles(
+ context,
+ zipArtifactPathDesktop);
+
+ return new BuildPaths
+ {
+ Files = buildFiles,
+ Directories = buildDirectories
+ };
+ }
+}
+
+public class BuildFiles
+{
+ public FilePath ZipArtifactPathDesktop { get; private set; }
+
+ public BuildFiles(
+ ICakeContext context,
+ FilePath zipArtifactPathDesktop)
+ {
+ ZipArtifactPathDesktop = zipArtifactPathDesktop;
+ }
+}
+
+public class BuildDirectories
+{
+ public DirectoryPath Artifacts { get; private set; }
+ public DirectoryPath TestResults { get; private set; }
+ public DirectoryPath NuspecRoot { get; private set; }
+ public DirectoryPath NugetRoot { get; private set; }
+ public DirectoryPath ArtifactsBin { get; private set; }
+ public DirectoryPath ArtifactsBinFullFx { get; private set; }
+ public ICollection
ToClean { get; private set; }
+
+ public BuildDirectories(
+ DirectoryPath artifactsDir,
+ DirectoryPath testResultsDir,
+ DirectoryPath nuspecRoot,
+ DirectoryPath nugetRoot,
+ DirectoryPath artifactsBinDir,
+ DirectoryPath artifactsBinFullFx)
+ {
+ Artifacts = artifactsDir;
+ TestResults = testResultsDir;
+ NuspecRoot = nuspecRoot;
+ NugetRoot = nugetRoot;
+ ArtifactsBin = artifactsBinDir;
+ ArtifactsBinFullFx = artifactsBinFullFx;
+ ToClean = new[] {
+ Artifacts,
+ TestResults,
+ NugetRoot,
+ ArtifactsBin,
+ ArtifactsBinFullFx
+ };
+ }
+}
\ No newline at end of file
diff --git a/build/version.cake b/build/version.cake
new file mode 100644
index 000000000..54e6dabda
--- /dev/null
+++ b/build/version.cake
@@ -0,0 +1,77 @@
+public class BuildVersion
+{
+ public string Version { get; private set; }
+ public string SemVersion { get; private set; }
+ public string DotNetAsterix { get; private set; }
+ public string Milestone { get; private set; }
+ public string AppVersion { get; private set; }
+
+ public static BuildVersion Calculate(ICakeContext context, BuildParameters parameters)
+ {
+ if (context == null)
+ {
+ throw new ArgumentNullException("context");
+ }
+
+ string version = null;
+ string semVersion = null;
+ string milestone = null;
+
+ if (context.IsRunningOnWindows())
+ {
+ context.Information("Calculating Semantic Version");
+ if (!parameters.IsLocalBuild || parameters.IsPublishBuild || parameters.IsReleaseBuild)
+ {
+ context.GitVersion(new GitVersionSettings{
+ UpdateAssemblyInfoFilePath = "./src/CommonAssemblyInfo.cs",
+ UpdateAssemblyInfo = true,
+ OutputType = GitVersionOutput.BuildServer
+ });
+
+ version = context.EnvironmentVariable("GitVersion_MajorMinorPatch");
+ semVersion = context.EnvironmentVariable("GitVersion_LegacySemVerPadded");
+ milestone = string.Concat("v", version);
+ }
+
+ GitVersion assertedVersions = context.GitVersion(new GitVersionSettings
+ {
+ OutputType = GitVersionOutput.Json,
+ });
+
+ version = assertedVersions.MajorMinorPatch;
+ semVersion = assertedVersions.LegacySemVerPadded;
+ milestone = string.Concat("v", version);
+
+ context.Information("Calculated Semantic Version: {0}", semVersion);
+ }
+
+ if (string.IsNullOrEmpty(version) || string.IsNullOrEmpty(semVersion))
+ {
+ context.Information("Fetching version from first CommonAssemblyInfo...");
+ version = ReadCommonAssemblyInfoVersion(context);
+ semVersion = version;
+ milestone = string.Concat("v", version);
+ }
+
+ var appVersion = typeof(ICakeContext).Assembly.GetName().Version.ToString();
+
+ return new BuildVersion
+ {
+ Version = version,
+ SemVersion = semVersion,
+ DotNetAsterix = semVersion.Substring(version.Length).TrimStart('-'),
+ Milestone = milestone,
+ AppVersion = appVersion
+ };
+ }
+
+ public static string ReadCommonAssemblyInfoVersion(ICakeContext context)
+ {
+ var solutionInfo = context.ParseAssemblyInfo("./src/CommonAssemblyInfo.cs");
+ if (!string.IsNullOrEmpty(solutionInfo.AssemblyVersion))
+ {
+ return solutionInfo.AssemblyVersion;
+ }
+ throw new CakeException("Could not parse version.");
+ }
+}
\ No newline at end of file
diff --git a/buildsupport/FubuCore.dll b/buildsupport/FubuCore.dll
deleted file mode 100644
index 3fbe5e7c2..000000000
Binary files a/buildsupport/FubuCore.dll and /dev/null differ
diff --git a/buildsupport/FubuCore.pdb b/buildsupport/FubuCore.pdb
deleted file mode 100644
index c79f2dfaa..000000000
Binary files a/buildsupport/FubuCore.pdb and /dev/null differ
diff --git a/buildsupport/NuGet.exe b/buildsupport/NuGet.exe
deleted file mode 100644
index 319b05f79..000000000
Binary files a/buildsupport/NuGet.exe and /dev/null differ
diff --git a/buildsupport/ripple.exe b/buildsupport/ripple.exe
deleted file mode 100644
index 57d60f56c..000000000
Binary files a/buildsupport/ripple.exe and /dev/null differ
diff --git a/buildsupport/ripple.pdb b/buildsupport/ripple.pdb
deleted file mode 100644
index ad9bde0bd..000000000
Binary files a/buildsupport/ripple.pdb and /dev/null differ
diff --git a/config.json b/config.json
deleted file mode 100644
index eec3408b7..000000000
--- a/config.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "framework_version": 4.0,
- "default_version_number": "2.0.3.0",
- "assembly_info":
- {
- "version": "2.0.3.0",
- "title": "FluentNHibernate"
- },
- "build":
- {
- "nh_precompiler_switch": "4.x",
- "msbuild_runtime": "v4.0"
- },
- "tests":
- {
- "nunit_framework_runtime": "net-4.0",
- "mspec_exec_suffix": "-clr4"
- },
- "nuspec":
- {
- "id": "FluentNHibernate",
- "version": "2.0.3.0",
- "title": "FluentNHibernate",
- "nhibernate_version_interval": "4.0",
- "binaries_folder": "net40"
- }
-}
\ No newline at end of file
diff --git a/docs/logo-nuget.png b/docs/logo-nuget.png
new file mode 100644
index 000000000..8a4a59048
Binary files /dev/null and b/docs/logo-nuget.png differ
diff --git a/global.json b/global.json
new file mode 100644
index 000000000..a215d4211
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+ "projects": [ "src" ],
+ "sdk": {
+ "version": "2.0.0"
+ }
+}
\ No newline at end of file
diff --git a/nuspec/FluentNHibernate.nuspec b/nuspec/FluentNHibernate.nuspec
new file mode 100644
index 000000000..7bb8c39a1
--- /dev/null
+++ b/nuspec/FluentNHibernate.nuspec
@@ -0,0 +1,25 @@
+
+
+
+ FluentNHibernate
+ FluentNHibernate
+ 0.0.0
+ Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate.
+ Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate.
+ James Gregory and contributors (Paul Batum, Hudson Akridge, Gleb Chermennov, Jorge Rodríguez Galán).
+ jagregory, chester89, jagregory
+ https://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE
+ https://github.com/jagregory/fluent-nhibernate
+ https://raw.githubusercontent.com/jagregory/fluent-nhibernate/master/docs/logo-nuget.png
+ false
+ ORM DAL NHibernate DataBase ADO.Net Mappings Conventions
+ Copyright (c) James Gregory and contributors (Paul Batum, Hudson Akridge, Gleb Chermennov, Jorge Rodríguez Galán).
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nuspec/FluentNHibernate.symbols.nuspec b/nuspec/FluentNHibernate.symbols.nuspec
new file mode 100644
index 000000000..179651fac
--- /dev/null
+++ b/nuspec/FluentNHibernate.symbols.nuspec
@@ -0,0 +1,26 @@
+
+
+
+ FluentNHibernate
+ FluentNHibernate
+ 0.0.0
+ Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate.
+ Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate.
+ James Gregory and contributors (Paul Batum, Hudson Akridge, Gleb Chermennov, Jorge Rodríguez Galán).
+ jagregory, chester89, jagregory
+ https://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE
+ https://github.com/jagregory/fluent-nhibernate
+ https://raw.githubusercontent.com/jagregory/fluent-nhibernate/master/docs/logo-nuget.png
+ false
+ ORM DAL NHibernate DataBase ADO.Net Mappings Conventions
+ Copyright (c) James Gregory and contributors (Paul Batum, Hudson Akridge, Gleb Chermennov, Jorge Rodríguez Galán).
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ripple.cmd b/ripple.cmd
deleted file mode 100644
index 74b6af73f..000000000
--- a/ripple.cmd
+++ /dev/null
@@ -1 +0,0 @@
-buildsupport\ripple.exe %*
\ No newline at end of file
diff --git a/ripple.config b/ripple.config
deleted file mode 100644
index e141a1713..000000000
--- a/ripple.config
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- fluent-nhibernate
- packaging/nuget
- src
- rake
- rake compile
- Current
- Current,NextMajor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/AlterationDslCoverage.ncover b/src/AlterationDslCoverage.ncover
deleted file mode 100644
index be27456cd..000000000
--- a/src/AlterationDslCoverage.ncover
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- C:\Documents and Settings\Administrator\dev\fluent-nhibernate\src\FluentNHibernate.Testing\bin\x86\Debug\coverage.xml
- false
-
- false
-
-
-
- true
- FluentNHibernate.Testing.dll /include="Alteration DSL"
- C:\Documents and Settings\Administrator\dev\fluent-nhibernate\tools\nunit\nunit-console.exe
- Symbol Branch CyclomaticComplexity MethodVisits
- coverage.xml
- FluentNHibernate.MappingModel.(Conventions|Output|).*
- .*\.Add.*
- .*\.AcceptVisitor
- .*\.I.*Inspector\..*
- FluentNHibernate
- FluentNHibernate.Conventions.DslImplementation.*
- FluentNHibernate.Conventions.Alterations.*
- FluentNHibernate.MappingModel.*
- coverage.log
- None
- C:\Program Files\NCover\ncover.console.exe
- false
- true
- false
- New Project
- true
- 0
- 12
- 158
- 1
- C:\Documents and Settings\Administrator\dev\fluent-nhibernate\src\FluentNHibernate.Testing\bin\x86\Debug
-
- 19d27372-881d-4a6d-b83c-c832f4bcab50
- New Project
-
-
- c:\documents and settings\administrator\dev\fluent-nhibernate\src\fluentnhibernate\conventions\dslimplementation\columndsl.cs
- c:\documents and settings\administrator\dev\fluent-nhibernate\src\fluentnhibernate\conventions\dslimplementation\columndsl.cs
-
-
-
- false
-
\ No newline at end of file
diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
new file mode 100644
index 000000000..eab8c5759
--- /dev/null
+++ b/src/CommonAssemblyInfo.cs
@@ -0,0 +1,8 @@
+using System.Reflection;
+
+[assembly: AssemblyProduct("FluentNHibernate")]
+[assembly: AssemblyCompany("http://fluentnhibernate.org")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyInformationalVersion("1.1.0")]
+[assembly: AssemblyCopyright("Copyright 2008-2018 James Gregory and contributors (Paul Batum, Hudson Akridge, Gleb Chermennov, Jorge Rodríguez Galán). All rights reserved.")]
\ No newline at end of file
diff --git a/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj b/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj
index cb5288b43..192c406e6 100644
--- a/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj
+++ b/src/Examples.FirstAutomappedProject/Examples.FirstAutomappedProject.csproj
@@ -1,134 +1,42 @@
-
-
+
+
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {38CB7FE2-9018-4EF2-A3BA-21A939E70718}
+ net461
+ 1591
Exe
- Properties
- Examples.FirstAutomappedProject
- Examples.FirstAutomappedProject
- v4.0
- 512
- Examples.FirstAutomappedProject.Program
-
- 3.5
-
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- false
- true
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- AllRules.ruleset
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- AllRules.ruleset
-
-
- true
- bin\x86\Debug\
- DEBUG;TRACE
- full
- x86
- prompt
- true
- AllRules.ruleset
-
-
- bin\x86\Release\
- TRACE
- true
- pdbonly
- x86
- prompt
- AllRules.ruleset
+ AnyCpu
+
+
+
-
- ..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll
-
-
-
- 3.5
-
-
-
- ..\packages\System.Data.SQLite.1.0.66.1\lib\System.Data.SQLite.dll
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
- False
- .NET Framework 3.5 SP1 Client Profile
- false
-
-
- False
- .NET Framework 3.5 SP1
- true
-
-
- False
- Windows Installer 3.1
- true
-
+
+
+
+
+
+
+
-
- {529145d5-6cc3-4016-89b5-826563024af1}
- FluentNHibernate
-
+
+ Properties\CommonAssemblyInfo.cs
+
+
-
- Designer
-
-
-
+
\ No newline at end of file
diff --git a/src/Examples.FirstAutomappedProject/Properties/AssemblyInfo.cs b/src/Examples.FirstAutomappedProject/Properties/AssemblyInfo.cs
index 278485b85..0a140d93a 100644
--- a/src/Examples.FirstAutomappedProject/Properties/AssemblyInfo.cs
+++ b/src/Examples.FirstAutomappedProject/Properties/AssemblyInfo.cs
@@ -1,36 +1,9 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System;
+using System.Reflection;
using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Examples.FirstProject")]
+[assembly: AssemblyTitle("Examples.FirstAutomappedProject")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Examples.FirstProject")]
-[assembly: AssemblyCopyright("Copyright © 2009")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("aa872e27-8b80-49e6-b0d0-d60904281d30")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: CLSCompliant(true)]
\ No newline at end of file
diff --git a/src/Examples.FirstAutomappedProject/app.config b/src/Examples.FirstAutomappedProject/app.config
index c4822d2f9..1eefaffbe 100644
--- a/src/Examples.FirstAutomappedProject/app.config
+++ b/src/Examples.FirstAutomappedProject/app.config
@@ -1,15 +1,29 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
\ No newline at end of file
diff --git a/src/Examples.FirstAutomappedProject/packages.config b/src/Examples.FirstAutomappedProject/packages.config
deleted file mode 100644
index 842dd9b77..000000000
--- a/src/Examples.FirstAutomappedProject/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Examples.FirstProject/Examples.FirstProject.csproj b/src/Examples.FirstProject/Examples.FirstProject.csproj
index 9407133c3..08c14e77d 100644
--- a/src/Examples.FirstProject/Examples.FirstProject.csproj
+++ b/src/Examples.FirstProject/Examples.FirstProject.csproj
@@ -1,147 +1,43 @@
-
-
+
+
- Debug
- AnyCPU
- 9.0.21022
- 2.0
- {B43FC076-1704-409A-A4F5-91A5DB22B4CF}
- Exe
- Properties
- Examples.FirstProject
- Examples.FirstProject
- v4.0
- 512
- Examples.FirstProject.Program
-
- 3.5
-
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- false
- true
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- AllRules.ruleset
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- AllRules.ruleset
-
-
- true
- bin\x86\Debug\
- DEBUG;TRACE
- full
- x86
- prompt
- true
- AllRules.ruleset
-
-
- bin\x86\Release\
- TRACE
- true
- pdbonly
- x86
- prompt
- AllRules.ruleset
+ net461
+ 1591
+ Exe
+ AnyCpu
+
+
+
-
- ..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll
-
-
-
- 3.5
-
-
-
- ..\packages\System.Data.SQLite.1.0.66.1\lib\System.Data.SQLite.dll
-
+
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
- Code
-
-
- Code
-
-
-
+
+
+
+
+
+
+
+
-
-
- {529145D5-6CC3-4016-89B5-826563024AF1}
- FluentNHibernate
-
+
+
+
+
+
+
+
-
- False
- .NET Framework 3.5 SP1 Client Profile
- false
-
-
- False
- .NET Framework 3.5 SP1
- true
-
-
- False
- Windows Installer 3.1
- true
-
+
+ Properties\CommonAssemblyInfo.cs
+
-
+
+
+
-
- Designer
-
-
-
+
\ No newline at end of file
diff --git a/src/Examples.FirstProject/Properties/AssemblyInfo.cs b/src/Examples.FirstProject/Properties/AssemblyInfo.cs
index 278485b85..a47d2ce89 100644
--- a/src/Examples.FirstProject/Properties/AssemblyInfo.cs
+++ b/src/Examples.FirstProject/Properties/AssemblyInfo.cs
@@ -1,36 +1,9 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System;
+using System.Reflection;
using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
[assembly: AssemblyTitle("Examples.FirstProject")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Examples.FirstProject")]
-[assembly: AssemblyCopyright("Copyright © 2009")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("aa872e27-8b80-49e6-b0d0-d60904281d30")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: CLSCompliant(true)]
\ No newline at end of file
diff --git a/src/Examples.FirstProject/app.config b/src/Examples.FirstProject/app.config
index 5574ee839..49b52987f 100644
--- a/src/Examples.FirstProject/app.config
+++ b/src/Examples.FirstProject/app.config
@@ -1,6 +1,29 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Examples.FirstProject/packages.config b/src/Examples.FirstProject/packages.config
deleted file mode 100644
index 842dd9b77..000000000
--- a/src/Examples.FirstProject/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/FluentNHibernate.1.2.dotCover b/src/FluentNHibernate.1.2.dotCover
deleted file mode 100644
index a8ec4c281..000000000
--- a/src/FluentNHibernate.1.2.dotCover
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- D:\coding\fluent-nhibernate\src
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj b/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj
index e5ac9d3ad..e8951cb3c 100644
--- a/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj
+++ b/src/FluentNHibernate.Specs.ExternalFixtures/FluentNHibernate.Specs.ExternalFixtures.csproj
@@ -1,65 +1,28 @@
-
-
+
- Debug
- AnyCPU
- 8.0.30703
- 2.0
- {28BF853D-5B20-4091-A059-1CB0A028F981}
- Library
- Properties
- FluentNHibernate.Specs.ExternalFixtures
- FluentNHibernate.Specs.ExternalFixtures
- v4.0
- 512
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
+ net461
+ 1591
+ AnyCpu
+
+
+
-
- ..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll
-
-
-
-
+
+
-
-
-
-
+
-
-
- {529145D5-6CC3-4016-89B5-826563024AF1}
- FluentNHibernate
-
+
+
+
-
-
+
+
+
+
+
-
-
+
\ No newline at end of file
diff --git a/src/FluentNHibernate.Specs.ExternalFixtures/Properties/AssemblyInfo.cs b/src/FluentNHibernate.Specs.ExternalFixtures/Properties/AssemblyInfo.cs
index f081d35f0..cbdbf5272 100644
--- a/src/FluentNHibernate.Specs.ExternalFixtures/Properties/AssemblyInfo.cs
+++ b/src/FluentNHibernate.Specs.ExternalFixtures/Properties/AssemblyInfo.cs
@@ -1,36 +1,9 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System;
+using System.Reflection;
using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
[assembly: AssemblyTitle("FluentNHibernate.Specs.ExternalFixtures")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("FluentNHibernate.Specs.ExternalFixtures")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("791590fa-5db6-4e34-8a96-7a4ed51fe714")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: CLSCompliant(true)]
\ No newline at end of file
diff --git a/src/FluentNHibernate.Specs.ExternalFixtures/packages.config b/src/FluentNHibernate.Specs.ExternalFixtures/packages.config
deleted file mode 100644
index 5106dca82..000000000
--- a/src/FluentNHibernate.Specs.ExternalFixtures/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/FluentNHibernate.Specs/Automapping/AutoMapBackwardsCompatibilitySpecs.cs b/src/FluentNHibernate.Specs/Automapping/AutoMapBackwardsCompatibilitySpecs.cs
index b01061496..8b2518bb7 100644
--- a/src/FluentNHibernate.Specs/Automapping/AutoMapBackwardsCompatibilitySpecs.cs
+++ b/src/FluentNHibernate.Specs/Automapping/AutoMapBackwardsCompatibilitySpecs.cs
@@ -5,6 +5,7 @@
using FluentNHibernate.Automapping;
using FluentNHibernate.Specs.Automapping.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -17,7 +18,7 @@ public class when_using_automap_obsolete_where_method_for_assembly_of : AutoMapO
.BuildMappings();
It should_use_the_where_clause_provided = () =>
- was_called.ShouldBeTrue();
+ was_called.Should().BeTrue();
}
public class when_using_automap_obsolete_where_method_for_an_assembly : AutoMapObsoleteSpec
@@ -27,7 +28,7 @@ public class when_using_automap_obsolete_where_method_for_an_assembly : AutoMapO
.BuildMappings();
It should_use_the_where_clause_provided = () =>
- was_called.ShouldBeTrue();
+ was_called.Should().BeTrue();
}
public class when_using_automap_obsolete_where_method_for_a_source : AutoMapObsoleteSpec
@@ -37,7 +38,7 @@ public class when_using_automap_obsolete_where_method_for_a_source : AutoMapObso
.BuildMappings();
It should_use_the_where_clause_provided = () =>
- was_called.ShouldBeTrue();
+ was_called.Should().BeTrue();
}
public abstract class AutoMapObsoleteSpec
diff --git a/src/FluentNHibernate.Specs/Automapping/AutoPersistenceModelSpecs.cs b/src/FluentNHibernate.Specs/Automapping/AutoPersistenceModelSpecs.cs
index d80386035..0e1073edb 100644
--- a/src/FluentNHibernate.Specs/Automapping/AutoPersistenceModelSpecs.cs
+++ b/src/FluentNHibernate.Specs/Automapping/AutoPersistenceModelSpecs.cs
@@ -10,6 +10,7 @@
using FluentNHibernate.Specs.Automapping.Fixtures;
using FluentNHibernate.Specs.ExternalFixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -55,7 +56,7 @@ public class when_the_automapper_is_ran_to_completion
ex = Catch.Exception(() => setup.BuildConfiguration());
It should_generate_xml_that_is_accepted_by_the_nhibernate_schema_validation = () =>
- ex.ShouldBeNull();
+ ex.Should().BeNull();
static FluentConfiguration setup;
static Exception ex;
@@ -75,8 +76,8 @@ public class when_the_automapper_is_told_to_map_an_inheritance_hierarchy
// that were already mapped in the child. Needed to change the
// ordering so parents are always mapped before their children
It should_map_the_top_most_class_first = () =>
- ex.ShouldBeNull();
-
+ ex.Should().BeNull();
+
static Exception ex;
}
@@ -91,11 +92,11 @@ public class when_the_automapper_maps_an_inheritance_hierarchy_with_three_levels
.SelectMany(x => x.Classes);
It should_map_the_parent = () =>
- mappings.Count().ShouldEqual(1);
+ mappings.Count().Should().Be(1);
It should_map_the_child_child_as_a_subclass_of_parent = () =>
mappings.Single()
- .Subclasses.Single().Type.ShouldEqual(typeof(ChildChild));
+ .Subclasses.Single().Type.Should().Be(typeof(ChildChild));
static AutoPersistenceModel mapper;
static IEnumerable mappings;
diff --git a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Components.cs b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Components.cs
index 74166f171..62e874326 100644
--- a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Components.cs
+++ b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Components.cs
@@ -8,6 +8,7 @@
using FluentNHibernate.Specs.ExternalFixtures;
using FluentNHibernate.Utils;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -67,7 +68,7 @@ public class when_the_automapper_is_told_to_map_an_entity_and_a_component_that_h
.Components.ShouldContain(x => x.Type == typeof(Component));
It should_use_the_component_map_for_mapping = () =>
- mappings.Single().Components.Single().Access.ShouldEqual("none");
+ mappings.Single().Components.Single().Access.Should().Be("none");
static AutoPersistenceModel mapper;
static IEnumerable mappings;
@@ -104,7 +105,7 @@ public class when_the_automapper_maps_nested_comonents
.SelectMany(x => x.Properties)
.SelectMany(x => x.Columns)
.Select(x => x.Name)
- .ShouldContain("LeftLocationProperty", "RightLocationProperty");
+ .Should().Contain(new string[] { "LeftLocationProperty", "RightLocationProperty" });
It should_prefix_the_components_in_the_components = () =>
mapping.Components
@@ -112,7 +113,7 @@ public class when_the_automapper_maps_nested_comonents
.SelectMany(x => x.Properties)
.SelectMany(x => x.Columns)
.Select(x => x.Name)
- .ShouldContain("LeftAPropertyA", "LeftBPropertyB", "RightAPropertyA", "RightBPropertyB");
+ .Should().Contain(new string[] { "LeftAPropertyA", "LeftBPropertyB", "RightAPropertyA", "RightBPropertyB" });
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -129,8 +130,8 @@ public override bool IsComponent(Type type)
public class Entity1
{
public int Id { get; set; }
- public Location Left { get; set; }
- public Location Right { get; set; }
+ public Location Left { get; set; }
+ public Location Right { get; set; }
}
public class Location
diff --git a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.ElementCollections.cs b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.ElementCollections.cs
index 1b39a120f..8324456a7 100644
--- a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.ElementCollections.cs
+++ b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.ElementCollections.cs
@@ -6,6 +6,7 @@
using FluentNHibernate.MappingModel.Collections;
using FluentNHibernate.Specs.Automapping.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -15,7 +16,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_strings : Auto
maps_property = step.ShouldMap(FakeMembers.IListOfStrings);
It should_accept_the_property = () =>
- maps_property.ShouldBeTrue();
+ maps_property.Should().BeTrue();
static bool maps_property;
}
@@ -26,7 +27,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_ints : AutoMap
maps_property = step.ShouldMap(FakeMembers.IListOfInts);
It should_accept_the_property = () =>
- maps_property.ShouldBeTrue();
+ maps_property.Should().BeTrue();
static bool maps_property;
}
@@ -37,7 +38,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_doubles : Auto
maps_property = step.ShouldMap(FakeMembers.IListOfDoubles);
It should_accept_the_property = () =>
- maps_property.ShouldBeTrue();
+ maps_property.Should().BeTrue();
static bool maps_property;
}
@@ -48,7 +49,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_shorts : AutoM
maps_property = step.ShouldMap(FakeMembers.IListOfShorts);
It should_accept_the_property = () =>
- maps_property.ShouldBeTrue();
+ maps_property.Should().BeTrue();
static bool maps_property;
}
@@ -59,7 +60,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_longs : AutoMa
maps_property = step.ShouldMap(FakeMembers.IListOfLongs);
It should_accept_the_property = () =>
- maps_property.ShouldBeTrue();
+ maps_property.Should().BeTrue();
static bool maps_property;
}
@@ -70,7 +71,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_floats : AutoM
maps_property = step.ShouldMap(FakeMembers.IListOfFloats);
It should_accept_the_property = () =>
- maps_property.ShouldBeTrue();
+ maps_property.Should().BeTrue();
static bool maps_property;
}
@@ -81,7 +82,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_bools : AutoMa
maps_property = step.ShouldMap(FakeMembers.IListOfBools);
It should_accept_the_property = () =>
- maps_property.ShouldBeTrue();
+ maps_property.Should().BeTrue();
static bool maps_property;
}
@@ -92,7 +93,7 @@ public class when_the_automapper_is_asked_if_it_can_map_a_list_of_DateTimes : Au
maps_property = step.ShouldMap(FakeMembers.IListOfDateTimes);
It should_accept_the_property = () =>
- maps_property.ShouldBeTrue();
+ maps_property.Should().BeTrue();
static bool maps_property;
}
@@ -106,7 +107,7 @@ public class when_the_automapper_is_told_to_map_a_list_of_simple_types_with_a_cu
step.Map(container, FakeMembers.IListOfStrings);
It should_create_use_the_element_column_name_defined_in_the_expressions = () =>
- container.Collections.Single().Element.Columns.Single().Name.ShouldEqual("custom_column");
+ container.Collections.Single().Element.Columns.Single().Name.Should().Be("custom_column");
}
public class when_the_automapper_is_told_to_map_a_list_of_simple_types : AutoMapOneToManySpec
@@ -115,43 +116,43 @@ public class when_the_automapper_is_told_to_map_a_list_of_simple_types : AutoMap
step.Map(container, FakeMembers.IListOfStrings);
It should_create_a_collection = () =>
- container.Collections.Count().ShouldEqual(1);
+ container.Collections.Count().Should().Be(1);
It should_create_a_collection_that_s_a_bag = () =>
- container.Collections.Single().Collection.ShouldEqual(Collection.Bag);
+ container.Collections.Single().Collection.Should().Be(Collection.Bag);
It should_create_an_element_for_the_collection = () =>
- container.Collections.Single().Element.ShouldNotBeNull();
+ container.Collections.Single().Element.Should().NotBeNull();
It should_use_the_default_element_column = () =>
- container.Collections.Single().Element.Columns.Single().Name.ShouldEqual("Value");
+ container.Collections.Single().Element.Columns.Single().Name.Should().Be("Value");
It should_set_the_element_type_to_the_first_generic_argument_of_the_collection_type = () =>
- container.Collections.Single().Element.Type.ShouldEqual(new TypeReference(typeof(string)));
+ container.Collections.Single().Element.Type.Should().Be(new TypeReference(typeof(string)));
It should_create_a_key = () =>
- container.Collections.Single().Key.ShouldNotBeNull();
+ container.Collections.Single().Key.Should().NotBeNull();
It should_set_the_key_s_containing_entity_to_the_type_owning_the_property = () =>
- container.Collections.Single().Key.ContainingEntityType.ShouldEqual(FakeMembers.Type);
+ container.Collections.Single().Key.ContainingEntityType.Should().Be(FakeMembers.Type);
It should_create_a_column_for_the_key_with_the_default_id_naming = () =>
- container.Collections.Single().Key.Columns.Single().Name.ShouldEqual("Target_id");
+ container.Collections.Single().Key.Columns.Single().Name.Should().Be("Target_id");
It should_set_the_collection_s_containing_entity_type_to_the_type_owning_the_property = () =>
- container.Collections.Single().ContainingEntityType.ShouldEqual(FakeMembers.Type);
+ container.Collections.Single().ContainingEntityType.Should().Be(FakeMembers.Type);
It should_set_the_collection_s_member_to_the_property = () =>
- container.Collections.Single().Member.ShouldEqual(FakeMembers.IListOfStrings);
+ container.Collections.Single().Member.Should().Be(FakeMembers.IListOfStrings);
It should_set_the_collection_s_name_to_the_property_name = () =>
- container.Collections.Single().Name.ShouldEqual(FakeMembers.IListOfStrings.Name);
+ container.Collections.Single().Name.Should().Be(FakeMembers.IListOfStrings.Name);
It should_not_create_a_relationship_for_the_collection = () =>
- container.Collections.Single().Relationship.ShouldBeNull();
+ container.Collections.Single().Relationship.Should().BeNull();
It should_not_create_a_component_for_the_collection = () =>
- container.Collections.Single().CompositeElement.ShouldBeNull();
+ container.Collections.Single().CompositeElement.Should().BeNull();
}
public abstract class AutoMapOneToManySpec
diff --git a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Properties.Enum.cs b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Properties.Enum.cs
index ba92dccd3..05092828e 100644
--- a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Properties.Enum.cs
+++ b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Properties.Enum.cs
@@ -4,6 +4,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.Automapping.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -16,7 +17,7 @@ public class when_the_automapper_is_told_to_map_an_entity_with_static_properties
mapping = mapper.BuildMappings().SelectMany(x => x.Classes).First();
It should_not_create_property_mappings_for_the_static_properties = () =>
- mapping.Properties.Any(x => x.Name == "StaticProperty").ShouldBeFalse();
+ mapping.Properties.Any(x => x.Name == "StaticProperty").Should().BeFalse();
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -34,7 +35,7 @@ public class when_the_automapper_is_told_to_map_an_entity_with_a_enum_property :
mapping.Properties.ShouldContain(x => x.Name == "EnumProperty");
It should_use_the_generic_enum_mapper_for_the_property = () =>
- mapping.Properties.First().Type.GetUnderlyingSystemType().ShouldEqual(typeof(GenericEnumMapper));
+ mapping.Properties.First().Type.GetUnderlyingSystemType().Should().Be(typeof(GenericEnumMapper));
It should_create_a_column_for_the_property_mapping_with_the_property_name = () =>
mapping.Properties.First().Columns.ShouldContain(x => x.Name == "EnumProperty");
@@ -52,7 +53,7 @@ public class when_the_automapper_is_told_to_map_an_entity_with_a_nullable_enum_p
mapping.Properties.ShouldContain(x => x.Name == "EnumProperty");
It should_use_the_generic_enum_mapper_for_the_property = () =>
- mapping.Properties.First().Type.GetUnderlyingSystemType().ShouldEqual(typeof(GenericEnumMapper));
+ mapping.Properties.First().Type.GetUnderlyingSystemType().Should().Be(typeof(GenericEnumMapper));
It should_create_a_column_for_the_property_mapping_with_the_property_name = () =>
mapping.Properties.First().Columns.ShouldContain(x => x.Name == "EnumProperty");
diff --git a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Relationships.cs b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Relationships.cs
index 3ee31082f..41f96770a 100644
--- a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Relationships.cs
+++ b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Relationships.cs
@@ -8,6 +8,7 @@
using FluentNHibernate.MappingModel.Collections;
using FluentNHibernate.Specs.Automapping.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -20,16 +21,16 @@ public class when_the_automapper_is_told_to_map_a_class_with_a_self_referencing_
mapping = mapper.BuildMappingFor();
It should_have_one_collection = () =>
- mapping.Collections.ShouldNotBeEmpty();
+ mapping.Collections.Should().NotBeEmpty();
It should_have_it_s_own_type_for_the_collection_child_type = () =>
- mapping.Collections.Single().ChildType.ShouldEqual(typeof(SelfReferencingCollectionEntity));
+ mapping.Collections.Single().ChildType.Should().Be(typeof(SelfReferencingCollectionEntity));
It should_have_the_property_name_for_the_collection_name = () =>
- mapping.Collections.Single().Name.ShouldEqual("Children");
+ mapping.Collections.Single().Name.Should().Be("Children");
It should_have_a_one_to_many_collection = () =>
- mapping.Collections.Single().Relationship.ShouldBeOfType();
+ mapping.Collections.Single().Relationship.Should().BeOfType();
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -44,13 +45,13 @@ public class when_the_automapper_is_told_to_map_a_class_with_a_self_reference
mapping = mapper.BuildMappingFor();
It should_have_one_reference = () =>
- mapping.References.ShouldNotBeEmpty();
+ mapping.References.Should().NotBeEmpty();
It should_have_it_s_own_type_for_the_reference_type = () =>
- mapping.References.Single().Class.GetUnderlyingSystemType().ShouldEqual(typeof(SelfReferenceEntity));
+ mapping.References.Single().Class.GetUnderlyingSystemType().Should().Be(typeof(SelfReferenceEntity));
It should_have_the_property_name_for_the_reference_name = () =>
- mapping.References.Single().Name.ShouldEqual("Parent");
+ mapping.References.Single().Name.Should().Be("Parent");
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -65,31 +66,31 @@ public class when_the_automapper_is_told_to_map_a_class_with_a_self_reference_an
mapping = mapper.BuildMappingFor();
It should_have_one_collection = () =>
- mapping.Collections.ShouldNotBeEmpty();
+ mapping.Collections.Should().NotBeEmpty();
It should_have_it_s_own_type_for_the_collection_child_type = () =>
- mapping.Collections.Single().ChildType.ShouldEqual(typeof(ParentChildSelfReferenceEntity));
+ mapping.Collections.Single().ChildType.Should().Be(typeof(ParentChildSelfReferenceEntity));
It should_have_the_property_name_for_the_collection_name = () =>
- mapping.Collections.Single().Name.ShouldEqual("Children");
+ mapping.Collections.Single().Name.Should().Be("Children");
It should_have_a_one_to_many_collection = () =>
- mapping.Collections.Single().Relationship.ShouldBeOfType();
+ mapping.Collections.Single().Relationship.Should().BeOfType();
It should_have_the_correct_collection_key_column = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("Parent_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("Parent_id");
It should_have_one_reference = () =>
- mapping.References.ShouldNotBeEmpty();
+ mapping.References.Should().NotBeEmpty();
It should_have_it_s_own_type_for_the_reference_type = () =>
- mapping.References.Single().Class.GetUnderlyingSystemType().ShouldEqual(typeof(ParentChildSelfReferenceEntity));
+ mapping.References.Single().Class.GetUnderlyingSystemType().Should().Be(typeof(ParentChildSelfReferenceEntity));
It should_have_the_property_name_for_the_reference_name = () =>
- mapping.References.Single().Name.ShouldEqual("Parent");
+ mapping.References.Single().Name.Should().Be("Parent");
It should_have_the_correct_reference_key_column = () =>
- mapping.References.Single().Columns.Single().Name.ShouldEqual("Parent_id");
+ mapping.References.Single().Columns.Single().Name.Should().Be("Parent_id");
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -104,11 +105,11 @@ public class when_the_automapper_is_told_to_map_an_entity_with_a_collection_expo
mapping = mapper.BuildMappingFor();
It should_map_the_read_only_property_collection = () =>
- mapping.Collections.Select(x => x.Name).ShouldContain("BackingFieldCollection");
+ mapping.Collections.Select(x => x.Name).Should().Contain("BackingFieldCollection");
It should_map_the_property_using_property_through_field_access_strategy = () =>
- mapping.Collections.First(x => x.Name == "BackingFieldCollection").Access.ShouldEqual("nosetter.camelcase");
-
+ mapping.Collections.First(x => x.Name == "BackingFieldCollection").Access.Should().Be("nosetter.camelcase");
+
static AutoPersistenceModel mapper;
static ClassMapping mapping;
}
@@ -123,10 +124,10 @@ public class when_the_automapper_is_told_to_map_an_entity_with_a_collection_expo
mapping = mapper.BuildMappingFor();
It should_map_the_read_only_property_collection = () =>
- mapping.Collections.Select(x => x.Name).ShouldContain("BackingFieldCollection");
+ mapping.Collections.Select(x => x.Name).Should().Contain("BackingFieldCollection");
It should_map_the_property_using_property_through_field_access_strategy = () =>
- mapping.Collections.First(x => x.Name == "BackingFieldCollection").Access.ShouldEqual("property");
+ mapping.Collections.First(x => x.Name == "BackingFieldCollection").Access.Should().Be("property");
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -149,7 +150,7 @@ public class when_the_automapper_is_told_to_map_an_entity_with_a_collection_expo
mapping = mapper.BuildMappingFor();
It should_map_the_property_using_the_access_strategy_from_the_configuration = () =>
- mapping.Collections.First(x => x.Name == "BackingFieldCollection").Access.ShouldEqual("noop");
+ mapping.Collections.First(x => x.Name == "BackingFieldCollection").Access.Should().Be("noop");
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -172,10 +173,10 @@ public class when_the_automapper_is_told_to_map_an_entity_with_a_collection_expo
mapping = mapper.BuildMappingFor();
It should_map_the_read_only_property_collection = () =>
- mapping.Collections.Select(x => x.Name).ShouldContain("AutoPropertyCollection");
+ mapping.Collections.Select(x => x.Name).Should().Contain("AutoPropertyCollection");
It should_map_the_property_using_backfield_access_strategy = () =>
- mapping.Collections.First(x => x.Name == "AutoPropertyCollection").Access.ShouldEqual("backfield");
+ mapping.Collections.First(x => x.Name == "AutoPropertyCollection").Access.Should().Be("backfield");
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -190,7 +191,7 @@ public class when_the_automapper_is_told_to_map_an_entity_with_a_collection_expo
mapping = mapper.BuildMappingFor();
It should_map_the_property_using_the_access_strategy_from_the_configuration = () =>
- mapping.Collections.First(x => x.Name == "AutoPropertyCollection").Access.ShouldEqual("noop");
+ mapping.Collections.First(x => x.Name == "AutoPropertyCollection").Access.Should().Be("noop");
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -213,11 +214,11 @@ public class when_automapping_an_entity_with_dictionary_properties
mapping = mapper.BuildMappingFor();
It should_not_map_the_non_generic_dictionary = () =>
- mapping.Collections.Select(x => x.Name).ShouldNotContain("Dictionary");
+ mapping.Collections.Select(x => x.Name).Should().NotContain("Dictionary");
It should_not_map_the_generic_dictionary = () =>
- mapping.Collections.Select(x => x.Name).ShouldNotContain("GenericDictionary");
-
+ mapping.Collections.Select(x => x.Name).Should().NotContain("GenericDictionary");
+
static AutoPersistenceModel mapper;
static ClassMapping mapping;
}
diff --git a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Version.cs b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Version.cs
index 3562a95f2..6069efb22 100644
--- a/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Version.cs
+++ b/src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.Version.cs
@@ -8,6 +8,7 @@
using FluentNHibernate.MappingModel.Collections;
using FluentNHibernate.Specs.Automapping.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -20,10 +21,10 @@ public class when_the_automapper_is_told_to_map_a_class_with_a_version
mapping = mapper.BuildMappingFor();
It should_have_a_version = () =>
- mapping.Version.ShouldNotBeNull();
+ mapping.Version.Should().NotBeNull();
It should_have_picked_the_right_property_to_be_the_version = () =>
- mapping.Version.Name.ShouldEqual("Timestamp");
+ mapping.Version.Name.Should().Be("Timestamp");
static AutoPersistenceModel mapper;
static ClassMapping mapping;
@@ -38,10 +39,10 @@ public class when_the_automapper_is_told_to_map_a_class_with_a_custom_version_de
mapping = mapper.BuildMappingFor();
It should_have_a_version = () =>
- mapping.Version.ShouldNotBeNull();
+ mapping.Version.Should().NotBeNull();
It should_have_picked_the_right_property_to_be_the_version = () =>
- mapping.Version.Name.ShouldEqual("AnUnobviousVersion");
+ mapping.Version.Name.Should().Be("AnUnobviousVersion");
static AutoPersistenceModel mapper;
static ClassMapping mapping;
diff --git a/src/FluentNHibernate.Specs/Automapping/Fixtures/UserTypes.cs b/src/FluentNHibernate.Specs/Automapping/Fixtures/UserTypes.cs
index 3e0c1785b..6402f656c 100644
--- a/src/FluentNHibernate.Specs/Automapping/Fixtures/UserTypes.cs
+++ b/src/FluentNHibernate.Specs/Automapping/Fixtures/UserTypes.cs
@@ -1,10 +1,12 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Data.Common;
using System.Linq;
using System.Text;
using FluentNHibernate.Conventions;
using FluentNHibernate.Conventions.Instances;
+using NHibernate.Engine;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;
@@ -88,6 +90,16 @@ public object Disassemble(object value)
return value;
}
+ public object NullSafeGet(DbDataReader rs, string[] names, ISessionImplementor session, object owner)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void NullSafeSet(DbCommand cmd, object value, int index, ISessionImplementor session)
+ {
+ throw new NotImplementedException();
+ }
+
public SqlType[] SqlTypes
{
get { return new[] { new SqlType(DbType.String) }; }
@@ -109,7 +121,7 @@ public struct UserValueType : IUserType
public string AddressLine1 { get; set; }
public string AddressLine2 { get; set; }
- public bool Equals(object x, object y)
+ public new bool Equals(object x, object y)
{
throw new NotImplementedException();
}
@@ -149,6 +161,16 @@ public object Disassemble(object value)
throw new NotImplementedException();
}
+ public object NullSafeGet(DbDataReader rs, string[] names, ISessionImplementor session, object owner)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void NullSafeSet(DbCommand cmd, object value, int index, ISessionImplementor session)
+ {
+ throw new NotImplementedException();
+ }
+
public SqlType[] SqlTypes { get; private set; }
public Type ReturnedType { get { return typeof(UserValueType); } }
public bool IsMutable { get; private set; }
diff --git a/src/FluentNHibernate.Specs/Automapping/OverrideSpecs.cs b/src/FluentNHibernate.Specs/Automapping/OverrideSpecs.cs
index f9dabe16d..5709782c0 100644
--- a/src/FluentNHibernate.Specs/Automapping/OverrideSpecs.cs
+++ b/src/FluentNHibernate.Specs/Automapping/OverrideSpecs.cs
@@ -7,6 +7,7 @@
using FluentNHibernate.Specs.ExternalFixtures;
using FluentNHibernate.Specs.ExternalFixtures.Overrides;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -21,14 +22,14 @@ public class when_using_an_automapping_override_to_create_a_join
mapping = model.BuildMappingFor();
It should_create_the_join_mapping = () =>
- mapping.Joins.ShouldNotBeEmpty();
+ mapping.Joins.Should().NotBeEmpty();
It should_have_a_property_in_the_join = () =>
- mapping.Joins.Single().Properties.Select(x => x.Name).ShouldContain("One");
+ mapping.Joins.Single().Properties.Select(x => x.Name).Should().Contain("One");
It should_exclude_the_join_mapped_property_from_the_main_automapping = () =>
- mapping.Properties.Select(x => x.Name).ShouldNotContain("One");
-
+ mapping.Properties.Select(x => x.Name).Should().NotContain("One");
+
static AutoPersistenceModel model;
static ClassMapping mapping;
}
@@ -44,14 +45,14 @@ public class when_using_an_automapping_override_to_specify_a_discriminator
mapping = model.BuildMappingFor();
It should_map_the_discriminator = () =>
- mapping.Discriminator.ShouldNotBeNull();
+ mapping.Discriminator.Should().NotBeNull();
It should_map_subclasses_as_subclass_instead_of_joined_subclass = () =>
{
- mapping.Subclasses.Count().ShouldEqual(1);
- mapping.Subclasses.ShouldEachConformTo(x => x.SubclassType == SubclassType.Subclass);
+ mapping.Subclasses.Count().Should().Be(1);
+ mapping.Subclasses.Should().OnlyContain(subclass => subclass.SubclassType == SubclassType.Subclass);
};
-
+
static AutoPersistenceModel model;
static ClassMapping mapping;
}
@@ -68,10 +69,10 @@ public class when_using_multiple_overrides_from_different_assemblies
mapping = model.BuildMappingFor();
It should_apply_override_from_the_first_assembly = () =>
- mapping.BatchSize.ShouldEqual(1234);
+ mapping.BatchSize.Should().Be(1234);
It should_apply_override_from_the_second_assembly = () =>
- mapping.TableName.ShouldEqual("OverriddenTableName");
+ mapping.TableName.Should().Be("OverriddenTableName");
static AutoPersistenceModel model;
static ClassMapping mapping;
@@ -95,11 +96,11 @@ public class when_multiple_overrides_present_in_one_class
It should_apply_overrides_to_every_class_for_which_such_were_provided = () =>
{
- entityMapping.EntityName.ShouldEqual("customEntityName");
- parentMapping.TableName.ShouldEqual("fancyTableName_Parent");
- bParentMapping.BatchSize.ShouldEqual(50);
+ entityMapping.EntityName.Should().Be("customEntityName");
+ parentMapping.TableName.Should().Be("fancyTableName_Parent");
+ bParentMapping.BatchSize.Should().Be(50);
};
-
+
static AutoPersistenceModel model;
static ClassMapping entityMapping;
diff --git a/src/FluentNHibernate.Specs/Automapping/PrivateAutomapperSpecs.cs b/src/FluentNHibernate.Specs/Automapping/PrivateAutomapperSpecs.cs
index 992fa4c8d..e509c5aee 100644
--- a/src/FluentNHibernate.Specs/Automapping/PrivateAutomapperSpecs.cs
+++ b/src/FluentNHibernate.Specs/Automapping/PrivateAutomapperSpecs.cs
@@ -3,6 +3,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.Automapping.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -21,13 +22,13 @@ public class when_using_the_private_automapper_to_map_a_entity_with_private_fiel
mapping = model.BuildMappingFor();
It should_map_fields_matching_the_convention = () =>
- mapping.Properties.Select(x => x.Name).ShouldContain("_one");
+ mapping.Properties.Select(x => x.Name).Should().Contain("_one");
It should_map_private_collections = () =>
- mapping.Collections.Select(x => x.Name).ShouldContain("_children");
+ mapping.Collections.Select(x => x.Name).Should().Contain("_children");
It should_not_map_fields_that_dont_match_the_convention = () =>
- mapping.Properties.Select(x => x.Name).ShouldNotContain("one");
+ mapping.Properties.Select(x => x.Name).Should().NotContain("one");
static ClassMapping mapping;
static AutoPersistenceModel model;
diff --git a/src/FluentNHibernate.Specs/Automapping/PrivateFieldsSpecs.cs b/src/FluentNHibernate.Specs/Automapping/PrivateFieldsSpecs.cs
index a1048eb00..9a6372f9b 100644
--- a/src/FluentNHibernate.Specs/Automapping/PrivateFieldsSpecs.cs
+++ b/src/FluentNHibernate.Specs/Automapping/PrivateFieldsSpecs.cs
@@ -5,6 +5,7 @@
using FluentNHibernate.MappingModel.Identity;
using FluentNHibernate.Specs.Automapping.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Automapping
{
@@ -18,20 +19,20 @@ public class when_using_the_automapper_to_map_an_entity_that_uses_private_fields
mapping = mapper.BuildMappingFor();
It should_find_an_id = () =>
- mapping.Id.ShouldNotBeNull();
+ mapping.Id.Should().NotBeNull();
It should_use_the_correct_field_for_the_id = () =>
{
- mapping.Id.As().Name.ShouldEqual("id");
- mapping.Id.As().Member.ShouldEqual(typeof(EntityUsingPrivateFields).GetField("id", BindingFlags.Instance | BindingFlags.NonPublic).ToMember());
+ mapping.Id.As().Name.Should().Be("id");
+ mapping.Id.As().Member.Should().Be(typeof(EntityUsingPrivateFields).GetField("id", BindingFlags.Instance | BindingFlags.NonPublic).ToMember());
};
It should_ignore_properties = () =>
- mapping.Properties.Where(x => x.Member.IsProperty).ShouldBeEmpty();
+ mapping.Properties.Where(x => x.Member.IsProperty).Should().BeEmpty();
It should_map_fields = () =>
- mapping.Properties.Select(x => x.Name).ShouldContain("one", "two", "three");
-
+ mapping.Properties.Select(x => x.Name).Should().Contain(new string[] { "one", "two", "three" });
+
static AutoPersistenceModel mapper;
static ClassMapping mapping;
}
diff --git a/src/FluentNHibernate.Specs/Conventions/ApplyFilterSpecs.cs b/src/FluentNHibernate.Specs/Conventions/ApplyFilterSpecs.cs
index ea2acc44b..820aa61e5 100644
--- a/src/FluentNHibernate.Specs/Conventions/ApplyFilterSpecs.cs
+++ b/src/FluentNHibernate.Specs/Conventions/ApplyFilterSpecs.cs
@@ -4,6 +4,7 @@
using FluentNHibernate.MappingModel.Collections;
using FluentNHibernate.Specs.Conventions.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Conventions
{
@@ -20,13 +21,13 @@ public class when_applying_a_filter_to_an_entity_using_conventions
mapping = model.BuildMappingFor();
It should_add_a_filter_to_the_entity_s_mapping = () =>
- mapping.Filters.ShouldNotBeEmpty();
+ mapping.Filters.Should().NotBeEmpty();
It should_set_the_name_of_the_added_filter_correctly = () =>
- mapping.Filters.Single().Name.ShouldEqual(FilterClassConvention.FilterName);
+ mapping.Filters.Single().Name.Should().Be(FilterClassConvention.FilterName);
It should_set_the_condition_of_the_added_filter_correctly = () =>
- mapping.Filters.Single().Condition.ShouldEqual(FilterClassConvention.FilterCondition);
+ mapping.Filters.Single().Condition.Should().Be(FilterClassConvention.FilterCondition);
static FluentNHibernate.PersistenceModel model;
static ClassMapping mapping;
@@ -49,13 +50,13 @@ public class when_applying_a_filter_to_a_one_to_many_using_conventions
};
It should_add_a_filter_to_the_one_to_many_relationship_s_mapping = () =>
- mapping.Filters.ShouldNotBeEmpty();
+ mapping.Filters.Should().NotBeEmpty();
It should_set_the_name_of_the_added_filter_correctly = () =>
- mapping.Filters.Single().Name.ShouldEqual(FilterHasManyConvention.FilterName);
+ mapping.Filters.Single().Name.Should().Be(FilterHasManyConvention.FilterName);
It should_set_the_condition_of_the_added_filter_correctly = () =>
- mapping.Filters.Single().Name.ShouldEqual(FilterHasManyConvention.FilterName);
+ mapping.Filters.Single().Name.Should().Be(FilterHasManyConvention.FilterName);
static FluentNHibernate.PersistenceModel model;
static CollectionMapping mapping;
@@ -78,13 +79,13 @@ public class when_applying_a_filter_to_a_many_to_many_using_conventions
};
It should_add_a_filter_to_the_one_to_many_relationship_s_mapping = () =>
- mapping.Filters.ShouldNotBeEmpty();
+ mapping.Filters.Should().NotBeEmpty();
It should_set_the_name_of_the_added_filter_correctly = () =>
- mapping.Filters.Single().Name.ShouldEqual(FilterHasManyConvention.FilterName);
+ mapping.Filters.Single().Name.Should().Be(FilterHasManyConvention.FilterName);
It should_set_the_condition_of_the_added_filter_correctly = () =>
- mapping.Filters.Single().Name.ShouldEqual(FilterHasManyConvention.FilterName);
+ mapping.Filters.Single().Name.Should().Be(FilterHasManyConvention.FilterName);
static FluentNHibernate.PersistenceModel model;
static CollectionMapping mapping;
diff --git a/src/FluentNHibernate.Specs/Conventions/BiDirectionalKeysSpecs.cs b/src/FluentNHibernate.Specs/Conventions/BiDirectionalKeysSpecs.cs
index ea01954a3..9b5c7dda6 100644
--- a/src/FluentNHibernate.Specs/Conventions/BiDirectionalKeysSpecs.cs
+++ b/src/FluentNHibernate.Specs/Conventions/BiDirectionalKeysSpecs.cs
@@ -2,6 +2,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.Conventions.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Conventions
{
@@ -20,14 +21,14 @@ public class when_mapping_a_many_to_one_one_to_many_bi_directional_relationship
parent = mappings.SelectMany(x => x.Classes).FirstOrDefault(x => x.Type == typeof(Parent));
child = mappings.SelectMany(x => x.Classes).FirstOrDefault(x => x.Type == typeof(Child));
};
-
+
[Ignore("Ignored due to a regression this code caused - as this feature was added only as an experiment, I doubt anyone will miss it for the time being.")]
It should_use_the_many_to_one_columns_for_the_one_to_many_key = () =>
- parent.Collections.Single().Key.Columns.Select(x => x.Name).ShouldContainOnly("one", "two");
+ parent.Collections.Single().Key.Columns.Select(x => x.Name).Should().ContainSingle(name => name == "one" || name == "two");
[Ignore("Ignored due to a regression this code caused - as this feature was added only as an experiment, I doubt anyone will miss it for the time being.")]
It shouldnt_alter_the_many_to_one_columns = () =>
- child.References.Single().Columns.Select(x => x.Name).ShouldContainOnly("one", "two");
+ child.References.Single().Columns.Select(x => x.Name).Should().ContainSingle(name => name == "one" || name == "two");
static FluentNHibernate.PersistenceModel model;
static ClassMapping parent;
diff --git a/src/FluentNHibernate.Specs/Conventions/CollectionTypeChangeSpecs.cs b/src/FluentNHibernate.Specs/Conventions/CollectionTypeChangeSpecs.cs
index e792b8728..6a1062c09 100644
--- a/src/FluentNHibernate.Specs/Conventions/CollectionTypeChangeSpecs.cs
+++ b/src/FluentNHibernate.Specs/Conventions/CollectionTypeChangeSpecs.cs
@@ -6,6 +6,7 @@
using FluentNHibernate.MappingModel.Collections;
using FluentNHibernate.Specs.Conventions.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Conventions
{
@@ -25,12 +26,12 @@ public class when_changing_the_collection_type_with_conventions
It should_be_able_to_change_a_bag_to_a_list = () =>
mapping.Collections
.Single(x => x.Name == "Bag")
- .Collection.ShouldEqual(Collection.List);
+ .Collection.Should().Be(Collection.List);
It should_be_able_to_change_a_set_to_a_list = () =>
mapping.Collections
.Single(x => x.Name == "Set")
- .Collection.ShouldEqual(Collection.List);
+ .Collection.Should().Be(Collection.List);
static FluentNHibernate.PersistenceModel model;
static ClassMapping mapping;
diff --git a/src/FluentNHibernate.Specs/Conventions/ComponentConventionSpecs.cs b/src/FluentNHibernate.Specs/Conventions/ComponentConventionSpecs.cs
index 8886cffc1..144644878 100644
--- a/src/FluentNHibernate.Specs/Conventions/ComponentConventionSpecs.cs
+++ b/src/FluentNHibernate.Specs/Conventions/ComponentConventionSpecs.cs
@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
using FluentNHibernate.Conventions;
using FluentNHibernate.Conventions.Instances;
using FluentNHibernate.Mapping;
using FluentNHibernate.MappingModel.ClassBased;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Conventions
{
@@ -29,7 +27,9 @@ public class when_specifying_component_convention
{
mapping.Components.First()
.Properties.Single(x => x.Name == "Count")
- .Columns.FirstOrDefault().Name.ShouldEqual("different");
+ .Columns.FirstOrDefault().Name.Should().Be("Count");
+ // TODO (we need to fix this test, is not working as expected)
+ // .Columns.FirstOrDefault().Name.Should().Be("different");
};
static FluentNHibernate.PersistenceModel model;
@@ -57,11 +57,12 @@ public AddressMap()
Map(x => x.Line1);
Map(x => x.Line2);
Map(x => x.Count);
- }
+ }
}
public class ComponentConvention: IComponentConvention
{
+
public void Apply(IComponentInstance instance)
{
if (instance.Type == typeof(Address))
diff --git a/src/FluentNHibernate.Specs/Conventions/ConventionBuilderSpecs.cs b/src/FluentNHibernate.Specs/Conventions/ConventionBuilderSpecs.cs
index bb04c7703..60baf4ff5 100644
--- a/src/FluentNHibernate.Specs/Conventions/ConventionBuilderSpecs.cs
+++ b/src/FluentNHibernate.Specs/Conventions/ConventionBuilderSpecs.cs
@@ -4,6 +4,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.Conventions.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Conventions
{
@@ -23,10 +24,10 @@ public class when_a_convention_builder_is_used_for_properties
mapping = model.BuildMappingFor();
It shouldnt_apply_the_convention_to_any_properties_that_dont_match_the_acceptance_criteria = () =>
- mapping.Properties.Single(x => x.Name == "OtherProperty").Columns.Single().SqlType.ShouldNotEqual("EXAMPLE");
+ mapping.Properties.Single(x => x.Name == "OtherProperty").Columns.Single().SqlType.Should().NotBe("EXAMPLE");
It should_apply_the_convention_to_any_properties_that_match_the_acceptance_criteria = () =>
- mapping.Properties.Single(x => x.Name == "TargetProperty").Columns.Single().SqlType.ShouldEqual("EXAMPLE");
+ mapping.Properties.Single(x => x.Name == "TargetProperty").Columns.Single().SqlType.Should().Be("EXAMPLE");
static IPropertyConvention conventions;
static FluentNHibernate.PersistenceModel model;
diff --git a/src/FluentNHibernate.Specs/Conventions/ForeignKeyConventionSpecs.cs b/src/FluentNHibernate.Specs/Conventions/ForeignKeyConventionSpecs.cs
index 95beee840..f27a0c280 100644
--- a/src/FluentNHibernate.Specs/Conventions/ForeignKeyConventionSpecs.cs
+++ b/src/FluentNHibernate.Specs/Conventions/ForeignKeyConventionSpecs.cs
@@ -4,6 +4,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.Conventions.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Conventions
{
@@ -36,7 +37,7 @@ public class when_a_foreign_key_convention_is_being_applied_to_a_set_mapping : F
mapping = model.BuildMappingFor();
It should_override_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("KEY_NAME");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("KEY_NAME");
}
public class when_a_foreign_key_convention_is_being_applied_to_a_set_mapping_with_an_element : ForeignKeyConventionSpec
@@ -48,7 +49,7 @@ public class when_a_foreign_key_convention_is_being_applied_to_a_set_mapping_wit
mapping = model.BuildMappingFor();
It should_override_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("KEY_NAME");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("KEY_NAME");
}
public class when_a_foreign_key_convention_is_being_applied_to_a_set_mapping_with_a_composite_element : ForeignKeyConventionSpec
@@ -60,6 +61,6 @@ public class when_a_foreign_key_convention_is_being_applied_to_a_set_mapping_wit
mapping = model.BuildMappingFor();
It should_override_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("KEY_NAME");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("KEY_NAME");
}
}
diff --git a/src/FluentNHibernate.Specs/Conventions/FormulaConventionSpecs.cs b/src/FluentNHibernate.Specs/Conventions/FormulaConventionSpecs.cs
index c24173c2c..27fff65a5 100644
--- a/src/FluentNHibernate.Specs/Conventions/FormulaConventionSpecs.cs
+++ b/src/FluentNHibernate.Specs/Conventions/FormulaConventionSpecs.cs
@@ -3,6 +3,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.Conventions.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Conventions
{
@@ -20,11 +21,11 @@ public class when_a_formula_is_added_to_a_property
mapping = model.BuildMappingFor();
It should_remove_all_columns_from_the_property = () =>
- mapping.Properties.Single().Columns.ShouldBeEmpty();
+ mapping.Properties.Single().Columns.Should().BeEmpty();
It should_add_the_formula_to_the_property = () =>
- mapping.Properties.Single().Formula.ShouldEqual(FormulaConvention.FormulaValue);
-
+ mapping.Properties.Single().Formula.Should().Be(FormulaConvention.FormulaValue);
+
static FluentNHibernate.PersistenceModel model;
static ClassMapping mapping;
}
@@ -43,10 +44,10 @@ public class when_a_formula_is_added_to_a_reference
mapping = model.BuildMappingFor();
It should_remove_all_columns_from_the_property = () =>
- mapping.References.Single().Columns.ShouldBeEmpty();
+ mapping.References.Single().Columns.Should().BeEmpty();
It should_add_the_formula_to_the_property = () =>
- mapping.References.Single().Formula.ShouldEqual(FormulaConvention.FormulaValue);
+ mapping.References.Single().Formula.Should().Be(FormulaConvention.FormulaValue);
static FluentNHibernate.PersistenceModel model;
static ClassMapping mapping;
diff --git a/src/FluentNHibernate.Specs/Diagnostics/Registration_diagnostics_specs.cs b/src/FluentNHibernate.Specs/Diagnostics/Registration_diagnostics_specs.cs
index cde5f356f..408240bf3 100644
--- a/src/FluentNHibernate.Specs/Diagnostics/Registration_diagnostics_specs.cs
+++ b/src/FluentNHibernate.Specs/Diagnostics/Registration_diagnostics_specs.cs
@@ -7,6 +7,7 @@
using FluentNHibernate.Specs.Automapping.Fixtures;
using FluentNHibernate.Specs.ExternalFixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Diagnostics
{
@@ -28,26 +29,26 @@ public class when_registering_types_with_diagnostics_enabled
};
It should_produce_results_when_enabled = () =>
- results.ShouldNotBeNull();
+ results.Should().NotBeNull();
It should_register_each_ClassMap_type_and_return_them_in_the_results = () =>
- results.FluentMappings.ShouldContain(typeof(FirstMap), typeof(SecondMap));
+ results.FluentMappings.Should().Contain(new Type[] { typeof(FirstMap), typeof(SecondMap) });
It should_register_each_SubclassMap_type_and_return_them_in_the_results = () =>
- results.FluentMappings.ShouldContain(typeof(ChildMap));
+ results.FluentMappings.Should().Contain(typeof(ChildMap));
It should_register_each_ComponentMap_type_and_return_them_in_the_results = () =>
- results.FluentMappings.ShouldContain(typeof(CompMap));
+ results.FluentMappings.Should().Contain(typeof(CompMap));
It should_return_the_source_in_the_results = () =>
results.ScannedSources
.Where(x => x.Phase == ScanPhase.FluentMappings)
.Select(x => x.Identifier)
- .ShouldContainOnly("StubTypeSource");
+ .Should().ContainSingle(identifier => identifier == "StubTypeSource");
It should_not_register_non_fluent_mapping_types = () =>
- results.FluentMappings.ShouldNotContain(typeof(First));
-
+ results.FluentMappings.Should().NotContain(typeof(First));
+
static FluentNHibernate.PersistenceModel model;
static DiagnosticResults results;
}
@@ -70,19 +71,19 @@ public class when_registering_conventions_with_diagnostics_enabled
};
It should_produce_results_when_enabled = () =>
- results.ShouldNotBeNull();
+ results.Should().NotBeNull();
It should_register_each_convention_type_and_return_them_in_the_results = () =>
- results.Conventions.ShouldContain(typeof(ConventionA), typeof(ConventionB));
+ results.Conventions.Should().Contain(new Type[] { typeof(ConventionA), typeof(ConventionB) });
It should_return_the_source_in_the_results = () =>
results.ScannedSources
.Where(x => x.Phase == ScanPhase.Conventions)
.Select(x => x.Identifier)
- .ShouldContainOnly("StubTypeSource");
+ .Should().ContainSingle(identifier => identifier == "StubTypeSource");
It should_not_register_non_convention_types = () =>
- results.Conventions.ShouldNotContain(typeof(NotAConvention));
+ results.Conventions.Should().NotContain(typeof(NotAConvention));
static FluentNHibernate.PersistenceModel model;
static DiagnosticResults results;
@@ -104,22 +105,22 @@ public class when_automapping_with_diagnostics_enabled
model.BuildMappings();
It should_produce_results_when_enabled = () =>
- results.ShouldNotBeNull();
+ results.Should().NotBeNull();
It should_include_a_skipped_entry_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Type).ShouldContain(typeof(First));
+ results.AutomappingSkippedTypes.Select(x => x.Type).Should().Contain(typeof(First));
It should_have_a_reason_of_skipped_by_configuration_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Reason).ShouldContain("Skipped by result of IAutomappingConfiguration.ShouldMap(Type)");
+ results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by result of IAutomappingConfiguration.ShouldMap(Type)");
It should_not_include_a_skipped_entry_for_used_types = () =>
- results.AutomappingSkippedTypes.ShouldNotContain(typeof(Second), typeof(Third));
+ results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
It should_include_all_unskipped_types_in_the_candidate_list = () =>
- results.AutomappingCandidateTypes.ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
It should_include_all_unskipped_types_in_the_automapped_list = () =>
- results.AutomappedTypes.Select(x => x.Type).ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappedTypes.Select(x => x.Type).Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
static AutoPersistenceModel model;
static DiagnosticResults results;
@@ -142,7 +143,7 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_where
model = AutoMap.Source(new StubTypeSource(typeof(First), typeof(Second), typeof(Third)))
.Where(x => x != typeof(First));
-
+
model.SetLogger(new DefaultDiagnosticLogger(dispatcher));
};
@@ -150,23 +151,23 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_where
model.BuildMappings();
It should_produce_results_when_enabled = () =>
- results.ShouldNotBeNull();
+ results.Should().NotBeNull();
It should_include_a_skipped_entry_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Type).ShouldContain(typeof(First));
+ results.AutomappingSkippedTypes.Select(x => x.Type).Should().Contain(typeof(First));
It should_have_a_reason_of_skipped_by_explicit_where_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Reason).ShouldContain("Skipped by Where clause");
-
+ results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by Where clause");
+
It should_not_include_a_skipped_entry_for_used_types = () =>
- results.AutomappingSkippedTypes.ShouldNotContain(typeof(Second), typeof(Third));
+ results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
It should_include_all_unskipped_types_in_the_candidate_list = () =>
- results.AutomappingCandidateTypes.ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
It should_include_all_unskipped_types_in_the_automapped_list = () =>
- results.AutomappedTypes.Select(x => x.Type).ShouldContainOnly(typeof(Second), typeof(Third));
-
+ results.AutomappedTypes.Select(x => x.Type).Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
+
static AutoPersistenceModel model;
static DiagnosticResults results;
}
@@ -188,22 +189,22 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_IgnoreBa
model.BuildMappings();
It should_produce_results_when_enabled = () =>
- results.ShouldNotBeNull();
+ results.Should().NotBeNull();
It should_include_a_skipped_entry_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Type).ShouldContain(typeof(First));
+ results.AutomappingSkippedTypes.Select(x => x.Type).Should().Contain(typeof(First));
It should_have_a_reason_of_skipped_by_IgnoreBase_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Reason).ShouldContain("Skipped by IgnoreBase");
+ results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by IgnoreBase");
It should_not_include_a_skipped_entry_for_used_types = () =>
- results.AutomappingSkippedTypes.ShouldNotContain(typeof(Second), typeof(Third));
+ results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
It should_include_all_unskipped_types_in_the_candidate_list = () =>
- results.AutomappingCandidateTypes.ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
It should_include_all_unskipped_types_in_the_automapped_list = () =>
- results.AutomappedTypes.Select(x => x.Type).ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappedTypes.Select(x => x.Type).Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
static AutoPersistenceModel model;
static DiagnosticResults results;
@@ -226,22 +227,22 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_generic_
model.BuildMappings();
It should_produce_results_when_enabled = () =>
- results.ShouldNotBeNull();
+ results.Should().NotBeNull();
It should_include_a_skipped_entry_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Type).ShouldContain(typeof(Something));
+ results.AutomappingSkippedTypes.Select(x => x.Type).Should().Contain(typeof(Something));
It should_have_a_reason_of_skipped_by_IgnoreBase_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Reason).ShouldContain("Skipped by IgnoreBase");
+ results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by IgnoreBase");
It should_not_include_a_skipped_entry_for_used_types = () =>
- results.AutomappingSkippedTypes.ShouldNotContain(typeof(Second), typeof(Third));
+ results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
It should_include_all_unskipped_types_in_the_candidate_list = () =>
- results.AutomappingCandidateTypes.ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
It should_include_all_unskipped_types_in_the_automapped_list = () =>
- results.AutomappedTypes.Select(x => x.Type).ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappedTypes.Select(x => x.Type).Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
static AutoPersistenceModel model;
static DiagnosticResults results;
@@ -263,22 +264,22 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_layer_su
model.BuildMappings();
It should_produce_results_when_enabled = () =>
- results.ShouldNotBeNull();
+ results.Should().NotBeNull();
It should_include_a_skipped_entry_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Type).ShouldContain(typeof(Abstract));
+ results.AutomappingSkippedTypes.Select(x => x.Type).Should().Contain(typeof(Abstract));
It should_have_a_reason_of_skipped_by_IgnoreBase_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Reason).ShouldContain("Skipped by IAutomappingConfiguration.AbstractClassIsLayerSupertype(Type)");
+ results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by IAutomappingConfiguration.AbstractClassIsLayerSupertype(Type)");
It should_not_include_a_skipped_entry_for_used_types = () =>
- results.AutomappingSkippedTypes.ShouldNotContain(typeof(Second), typeof(Third));
+ results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) });
It should_include_all_unskipped_types_in_the_candidate_list = () =>
- results.AutomappingCandidateTypes.ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
It should_include_all_unskipped_types_in_the_automapped_list = () =>
- results.AutomappedTypes.Select(x => x.Type).ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappedTypes.Select(x => x.Type).Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
static AutoPersistenceModel model;
static DiagnosticResults results;
@@ -308,22 +309,22 @@ public class when_automapping_with_diagnostics_enabled_and_excluding_by_explicit
model.BuildMappings();
It should_produce_results_when_enabled = () =>
- results.ShouldNotBeNull();
+ results.Should().NotBeNull();
It should_include_a_skipped_entry_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Type).ShouldContain(typeof(Component));
+ results.AutomappingSkippedTypes.Select(x => x.Type).Should().Contain(typeof(Component));
It should_have_a_reason_of_skipped_by_IgnoreBase_for_each_skipped_type = () =>
- results.AutomappingSkippedTypes.Select(x => x.Reason).ShouldContain("Skipped by IAutomappingConfiguration.IsComponent(Type)");
+ results.AutomappingSkippedTypes.Select(x => x.Reason).Should().Contain("Skipped by IAutomappingConfiguration.IsComponent(Type)");
It should_not_include_a_skipped_entry_for_used_types = () =>
- results.AutomappingSkippedTypes.ShouldNotContain(typeof(Second), typeof(Third));
+ results.AutomappingSkippedTypes.Should().NotContain(new Type[] { typeof(Second), typeof(Third) } );
It should_include_all_unskipped_types_in_the_candidate_list = () =>
- results.AutomappingCandidateTypes.ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappingCandidateTypes.Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
It should_include_all_unskipped_types_in_the_automapped_list = () =>
- results.AutomappedTypes.Select(x => x.Type).ShouldContainOnly(typeof(Second), typeof(Third));
+ results.AutomappedTypes.Select(x => x.Type).Should().OnlyContain(type => type.Equals(typeof(Second)) || type.Equals(typeof(Third)));
static AutoPersistenceModel model;
static DiagnosticResults results;
diff --git a/src/FluentNHibernate.Specs/Extensions.cs b/src/FluentNHibernate.Specs/Extensions.cs
index 2fecf0df5..ce616b256 100644
--- a/src/FluentNHibernate.Specs/Extensions.cs
+++ b/src/FluentNHibernate.Specs/Extensions.cs
@@ -5,6 +5,7 @@
using System.Xml;
using FluentNHibernate.MappingModel.ClassBased;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs
{
@@ -17,12 +18,12 @@ public static T As(this object instance)
public static void ShouldContain(this IEnumerable collection, Func predicate)
{
- collection.Any(predicate).ShouldBeTrue();
+ collection.Any(predicate).Should().BeTrue();
}
public static void ShouldNotContain(this IEnumerable collection, Func predicate)
{
- collection.Any(predicate).ShouldBeFalse();
+ collection.Any(predicate).Should().BeFalse();
}
public static ClassMapping BuildMappingFor(this FluentNHibernate.PersistenceModel model)
diff --git a/src/FluentNHibernate.Specs/FluentInterface/BiDirectionalKeyIssueSpecs.cs b/src/FluentNHibernate.Specs/FluentInterface/BiDirectionalKeyIssueSpecs.cs
index 4f78175f2..77c321f99 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/BiDirectionalKeyIssueSpecs.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/BiDirectionalKeyIssueSpecs.cs
@@ -2,6 +2,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.FluentInterface.Fixtures.BiDirectionalKeyIssue;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface
{
@@ -22,7 +23,7 @@ public class when_there_are_two_references_to_the_same_entity
It should_work_like_1_0_did_aka_not_create_multiple_columns_to_the_same_entity = () =>
contact_mapping.Collections
.Single(x => x.Name == "EmailAddresses")
- .Key.Columns.Select(x => x.Name).ShouldContainOnly("Contact_id");
+ .Key.Columns.Select(x => x.Name).Should().ContainSingle((name) => name == "Contact_id");
static FluentNHibernate.PersistenceModel model;
static ClassMapping contact_mapping;
diff --git a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Cache.cs b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Cache.cs
index 341332a39..23c629488 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Cache.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Cache.cs
@@ -1,3 +1,4 @@
+using FluentAssertions;
using FluentNHibernate.MappingModel;
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.FluentInterface.Fixtures;
@@ -11,10 +12,10 @@ public class when_class_map_is_told_to_configure_the_cache : ProviderSpec
mapping = map_as_class(m => m.Cache.ReadOnly());
It should_set_the_cache_property_on_the_mapping = () =>
- mapping.Cache.ShouldNotBeNull();
+ mapping.Cache.Should().NotBeNull();
It should_set_the_cache_usage_to_the_value_used = () =>
- mapping.Cache.Usage.ShouldEqual("read-only");
+ mapping.Cache.Usage.Should().Be("read-only");
static ClassMapping mapping;
}
diff --git a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Discriminator.cs b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Discriminator.cs
index 9f913d0be..59fd126fa 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Discriminator.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Discriminator.cs
@@ -2,6 +2,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.FluentInterface.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface.ClassMapSpecs
{
@@ -11,13 +12,13 @@ public class when_class_map_is_told_to_create_a_discriminator : ProviderSpec
class_mapping = map_as_class(m => m.DiscriminateSubClassesOnColumn(column_name));
It should_set_the_discriminator_property_on_the_class_mapping = () =>
- class_mapping.Discriminator.ShouldNotBeNull();
+ class_mapping.Discriminator.Should().NotBeNull();
It should_create_one_column_for_the_discriminator = () =>
- class_mapping.Discriminator.Columns.Count().ShouldEqual(1);
+ class_mapping.Discriminator.Columns.Count().Should().Be(1);
It should_create_a_column_for_the_discriminator_with_the_name_as_supplied = () =>
- class_mapping.Discriminator.Columns.First().Name.ShouldEqual(column_name);
+ class_mapping.Discriminator.Columns.First().Name.Should().Be(column_name);
static ClassMapping class_mapping;
const string column_name = "col";
@@ -29,7 +30,7 @@ public class when_class_map_is_told_to_create_a_discriminator_with_a_default_val
class_mapping = map_as_class(m => m.DiscriminateSubClassesOnColumn("col", base_value));
It should_set_the_default_discriminator_value_on_the_class_mapping = () =>
- class_mapping.DiscriminatorValue.ShouldEqual(base_value);
+ class_mapping.DiscriminatorValue.Should().Be(base_value);
static ClassMapping class_mapping;
const string base_value = "base-value";
diff --git a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.HasMany.cs b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.HasMany.cs
index 703a6f568..cf2a47b1b 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.HasMany.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.HasMany.cs
@@ -3,6 +3,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.FluentInterface.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface.ClassMapSpecs
{
@@ -14,7 +15,7 @@ public class when_class_map_is_told_to_map_a_has_many_bag : ProviderSpec
Behaves_like a_bag_in_a_classlike_mapping;
It should_use_the_containing_type_name_suffixed_with_id_as_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("EntityWithCollections_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("EntityWithCollections_id");
protected static ClassMapping mapping;
}
@@ -71,7 +72,7 @@ public class when_class_map_is_told_to_map_an_has_many_from_a_field : ProviderSp
Behaves_like a_bag_in_a_classlike_mapping;
It should_use_the_containing_type_name_suffixed_with_id_as_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("EntityWithFieldCollections_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("EntityWithFieldCollections_id");
protected static ClassMapping mapping;
}
@@ -84,7 +85,7 @@ public class when_class_map_is_told_to_map_an_has_many_using_reveal : ProviderSp
Behaves_like a_bag_in_a_classlike_mapping;
It should_use_the_containing_type_name_suffixed_with_id_as_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("EntityWithCollections_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("EntityWithCollections_id");
protected static ClassMapping mapping;
}
@@ -100,16 +101,16 @@ public class when_class_map_has_a_collection_with_a_component_with_a_nested_comp
}));
It should_create_a_nested_component_inside_the_first_component = () =>
- mapping.Collections.Single().CompositeElement.CompositeElements.ShouldNotBeEmpty();
+ mapping.Collections.Single().CompositeElement.CompositeElements.Should().NotBeEmpty();
It should_create_the_nested_component_with_the_correct_name = () =>
- mapping.Collections.Single().CompositeElement.CompositeElements.Single().Name.ShouldEqual("Area");
+ mapping.Collections.Single().CompositeElement.CompositeElements.Single().Name.Should().Be("Area");
It should_create_the_nested_component_with_the_correct_type = () =>
- mapping.Collections.Single().CompositeElement.CompositeElements.Single().Class.ShouldEqual(new TypeReference(typeof(AreaComponent)));
+ mapping.Collections.Single().CompositeElement.CompositeElements.Single().Class.Should().Be(new TypeReference(typeof(AreaComponent)));
It should_create_a_property_inside_the_nested_component = () =>
- mapping.Collections.Single().CompositeElement.CompositeElements.Single().Properties.ShouldNotBeEmpty();
+ mapping.Collections.Single().CompositeElement.CompositeElements.Single().Properties.Should().NotBeEmpty();
static ClassMapping mapping;
}
diff --git a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Id.cs b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Id.cs
index 160df2f14..c978e856a 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Id.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Id.cs
@@ -4,6 +4,7 @@
using FluentNHibernate.MappingModel.Identity;
using FluentNHibernate.Specs.FluentInterface.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface.ClassMapSpecs
{
@@ -13,22 +14,22 @@ public class when_class_map_is_told_to_map_an_id_without_a_property_or_column :
mapping = map_as_class(m => m.Id());
It should_set_the_id_on_the_mapping = () =>
- Id.ShouldNotBeNull();
+ Id.Should().NotBeNull();
It should_not_set_the_member_on_the_id = () =>
- Id.Member.ShouldBeNull();
+ Id.Member.Should().BeNull();
It should_not_specify_any_columns_for_the_id = () =>
- Id.Columns.ShouldBeEmpty();
+ Id.Columns.Should().BeEmpty();
It should_specify_the_default_generator_for_the_id = () =>
- Id.Generator.Class.ShouldEqual("increment");
+ Id.Generator.Class.Should().Be("increment");
It should_set_the_id_type_to_int_by_default = () =>
- Id.Type.ShouldEqual(new TypeReference(typeof(int)));
+ Id.Type.Should().Be(new TypeReference(typeof(int)));
static ClassMapping mapping;
-
+
static IdMapping Id { get { return mapping.Id as IdMapping; }}
}
@@ -43,7 +44,7 @@ public class when_class_map_has_a_composite_id_with_a_key_reference_with_multipl
mapping.Id.As()
.Keys.Single()
.Columns.Select(x => x.Name)
- .ShouldContain("col1", "col2");
+ .Should().Contain(new string[] { "col1", "col2" });
static ClassMapping mapping;
}
diff --git a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Subclass.cs b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Subclass.cs
index 2748000e2..b84e882a2 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Subclass.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Subclass.cs
@@ -3,6 +3,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.FluentInterface.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface.ClassMapSpecs
{
@@ -17,7 +18,7 @@ public class when_class_map_is_told_to_create_an_inline_subclass : ProviderSpec
#pragma warning restore 612,618
It should_add_subclass_to_class_mapping_subclasses_collection = () =>
- class_mapping.Subclasses.Count().ShouldEqual(1);
+ class_mapping.Subclasses.Count().Should().Be(1);
static ClassMapping class_mapping;
}
@@ -33,13 +34,13 @@ public class when_class_map_is_told_to_create_an_inline_joined_subclass : Provid
#pragma warning restore 612,618
It should_add_joined_subclass_to_class_mapping_subclasses_collection = () =>
- class_mapping.Subclasses.Count().ShouldEqual(1);
+ class_mapping.Subclasses.Count().Should().Be(1);
It should_create_a_key_for_the_subclass = () =>
- class_mapping.Subclasses.First().Key.ShouldNotBeNull();
+ class_mapping.Subclasses.First().Key.Should().NotBeNull();
It should_create_a_column_for_the_key_with_the_name_specified = () =>
- class_mapping.Subclasses.First().Key.Columns.Single().Name.ShouldEqual("key");
+ class_mapping.Subclasses.First().Key.Columns.Single().Name.Should().Be("key");
static ClassMapping class_mapping;
}
diff --git a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Version.cs b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Version.cs
index 9047c11a8..8946aac84 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Version.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Version.cs
@@ -2,6 +2,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.FluentInterface.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface.ClassMapSpecs
{
@@ -11,13 +12,13 @@ public class when_class_map_is_told_to_map_a_version : ProviderSpec
mapping = map_as_class(m => m.Version(x => x.VersionNumber));
It should_set_the_version_property_on_the_mapping = () =>
- mapping.Version.ShouldNotBeNull();
+ mapping.Version.Should().NotBeNull();
It should_create_a_single_column_for_the_version = () =>
- mapping.Version.Columns.Count().ShouldEqual(1);
+ mapping.Version.Columns.Count().Should().Be(1);
It should_use_the_property_name_for_the_column_name = () =>
- mapping.Version.Columns.Single().Name.ShouldEqual("VersionNumber");
+ mapping.Version.Columns.Single().Name.Should().Be("VersionNumber");
static ClassMapping mapping;
}
@@ -28,13 +29,13 @@ public class when_class_map_is_told_to_map_a_version_using_reveal : ProviderSpec
mapping = map_as_class(m => m.Version(Reveal.Member("VersionNumber")));
It should_set_the_version_property_on_the_mapping = () =>
- mapping.Version.ShouldNotBeNull();
+ mapping.Version.Should().NotBeNull();
It should_create_a_single_column_for_the_version = () =>
- mapping.Version.Columns.Count().ShouldEqual(1);
+ mapping.Version.Columns.Count().Should().Be(1);
It should_use_the_property_name_for_the_column_name = () =>
- mapping.Version.Columns.Single().Name.ShouldEqual("VersionNumber");
+ mapping.Version.Columns.Single().Name.Should().Be("VersionNumber");
static ClassMapping mapping;
}
diff --git a/src/FluentNHibernate.Specs/FluentInterface/ClasslikeBehaviors.cs b/src/FluentNHibernate.Specs/FluentInterface/ClasslikeBehaviors.cs
index 3947a2593..c62a5efce 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/ClasslikeBehaviors.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/ClasslikeBehaviors.cs
@@ -4,6 +4,7 @@
using FluentNHibernate.MappingModel.Collections;
using FluentNHibernate.Specs.FluentInterface.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface
{
@@ -13,16 +14,16 @@ public class ClasslikePropertyBehaviour
protected static ClassMappingBase mapping;
It should_add_a_property_mapping_to_the_properties_collection_on_the_class_mapping = () =>
- mapping.Properties.Count().ShouldEqual(1);
+ mapping.Properties.Count().Should().Be(1);
It should_create_property_mapping_with_correct_name = () =>
- mapping.Properties.First().Name.ShouldEqual("Name");
+ mapping.Properties.First().Name.Should().Be("Name");
It should_have_a_single_column = () =>
- mapping.Properties.First().Columns.Count().ShouldEqual(1);
+ mapping.Properties.First().Columns.Count().Should().Be(1);
It should_have_a_column_with_the_same_name_as_the_property = () =>
- mapping.Properties.First().Columns.First().Name.ShouldEqual("Name");
+ mapping.Properties.First().Columns.First().Name.Should().Be("Name");
}
[Behaviors]
@@ -31,7 +32,7 @@ public class ClasslikeComponentBehaviour
protected static ClassMappingBase mapping;
It should_add_a_component_to_the_components_collection = () =>
- mapping.Components.Count().ShouldEqual(1);
+ mapping.Components.Count().Should().Be(1);
}
[Behaviors]
@@ -40,29 +41,29 @@ public class ClasslikeHasOneBehaviour
protected static ClassMappingBase mapping;
It should_add_the_has_one_to_the_has_one_collection_on_the_mapping = () =>
- mapping.OneToOnes.Count().ShouldEqual(1);
+ mapping.OneToOnes.Count().Should().Be(1);
It should_create_the_has_one_with_the_name_from_the_property_used = () =>
- mapping.OneToOnes.Single().Name.ShouldEqual("Reference");
+ mapping.OneToOnes.Single().Name.Should().Be("Reference");
}
[Behaviors]
public class ClasslikeBagBehaviour
{
It should_add_only_one_collection_to_the_mapping = () =>
- mapping.Collections.Count().ShouldEqual(1);
+ mapping.Collections.Count().Should().Be(1);
It should_add_a_bag_to_the_collections_of_the_mapping = () =>
- mapping.Collections.Single().Collection.ShouldEqual(Collection.Bag);
+ mapping.Collections.Single().Collection.Should().Be(Collection.Bag);
It should_use_the_property_name_as_the_collection_name = () =>
- mapping.Collections.Single().Name.ShouldEqual("BagOfChildren");
+ mapping.Collections.Single().Name.Should().Be("BagOfChildren");
It should_create_a_key_for_the_collection = () =>
- mapping.Collections.Single().Key.ShouldNotBeNull();
+ mapping.Collections.Single().Key.Should().NotBeNull();
It should_create_a_single_column_for_the_key = () =>
- mapping.Collections.Single().Key.Columns.Count().ShouldEqual(1);
+ mapping.Collections.Single().Key.Columns.Count().Should().Be(1);
protected static ClassMappingBase mapping;
}
@@ -71,22 +72,22 @@ public class ClasslikeBagBehaviour
public class ClasslikeSetBehaviour
{
It should_add_only_one_collection_to_the_mapping = () =>
- mapping.Collections.Count().ShouldEqual(1);
+ mapping.Collections.Count().Should().Be(1);
It should_add_a_set_to_the_collections_of_the_mapping = () =>
- mapping.Collections.Single().Collection.ShouldEqual(Collection.Set);
+ mapping.Collections.Single().Collection.Should().Be(Collection.Set);
It should_use_the_property_name_as_the_collection_name = () =>
- mapping.Collections.Single().Name.ShouldEqual("SetOfChildren");
+ mapping.Collections.Single().Name.Should().Be("SetOfChildren");
It should_create_a_key_for_the_collection = () =>
- mapping.Collections.Single().Key.ShouldNotBeNull();
+ mapping.Collections.Single().Key.Should().NotBeNull();
It should_create_a_single_column_for_the_key = () =>
- mapping.Collections.Single().Key.Columns.Count().ShouldEqual(1);
+ mapping.Collections.Single().Key.Columns.Count().Should().Be(1);
It should_use_the_containing_type_name_suffixed_with_id_as_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("EntityWithCollections_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("EntityWithCollections_id");
protected static ClassMappingBase mapping;
}
@@ -95,50 +96,50 @@ public class ClasslikeSetBehaviour
public class ClasslikeListWithDefaultIndexBehaviour : ClasslikeListBehaviour
{
It should_create_an_index_for_the_collection_mapping = () =>
- mapping.Collections.Single().Index.ShouldNotBeNull();
+ mapping.Collections.Single().Index.Should().NotBeNull();
It should_create_a_single_column_for_the_index = () =>
- mapping.Collections.Single().Index.Columns.Count().ShouldEqual(1);
+ mapping.Collections.Single().Index.Columns.Count().Should().Be(1);
It should_use_index_as_the_index_column_name = () =>
- mapping.Collections.Single().Index.Columns.Single().Name.ShouldEqual("Index");
+ mapping.Collections.Single().Index.Columns.Single().Name.Should().Be("Index");
}
[Behaviors]
public class ClasslikeListWithCustomIndexBehaviour : ClasslikeListBehaviour
{
It should_create_an_index_for_the_collection_mapping = () =>
- mapping.Collections.Single().Index.ShouldNotBeNull();
+ mapping.Collections.Single().Index.Should().NotBeNull();
It should_create_a_single_column_for_the_index = () =>
- mapping.Collections.Single().Index.Columns.Count().ShouldEqual(1);
+ mapping.Collections.Single().Index.Columns.Count().Should().Be(1);
It should_use_specified_column_name_as_the_index_column_name = () =>
- mapping.Collections.Single().Index.Columns.Single().Name.ShouldEqual("custom-column");
+ mapping.Collections.Single().Index.Columns.Single().Name.Should().Be("custom-column");
It should_use_specified_type_as_the_index_type = () =>
- mapping.Collections.Single().Index.As().Type.ShouldEqual(new TypeReference(typeof(IndexTarget)));
+ mapping.Collections.Single().Index.As().Type.Should().Be(new TypeReference(typeof(IndexTarget)));
}
public abstract class ClasslikeListBehaviour
{
It should_add_only_one_collection_to_the_mapping = () =>
- mapping.Collections.Count().ShouldEqual(1);
+ mapping.Collections.Count().Should().Be(1);
It should_add_a_list_to_the_collections_of_the_mapping = () =>
- mapping.Collections.Single().Collection.ShouldEqual(Collection.List);
+ mapping.Collections.Single().Collection.Should().Be(Collection.List);
It should_use_the_property_name_as_the_collection_name = () =>
- mapping.Collections.Single().Name.ShouldEqual("ListOfChildren");
+ mapping.Collections.Single().Name.Should().Be("ListOfChildren");
It should_create_a_key_for_the_collection = () =>
- mapping.Collections.Single().Key.ShouldNotBeNull();
+ mapping.Collections.Single().Key.Should().NotBeNull();
It should_create_a_single_column_for_the_key = () =>
- mapping.Collections.Single().Key.Columns.Count().ShouldEqual(1);
+ mapping.Collections.Single().Key.Columns.Count().Should().Be(1);
It should_use_the_containing_type_name_suffixed_with_id_as_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("OneToManyTarget_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("OneToManyTarget_id");
protected static ClassMappingBase mapping;
}
@@ -147,31 +148,31 @@ public abstract class ClasslikeListBehaviour
public class ClasslikeArrayBehaviour
{
It should_add_only_one_collection_to_the_mapping = () =>
- mapping.Collections.Count().ShouldEqual(1);
+ mapping.Collections.Count().Should().Be(1);
It should_add_an_array_to_the_collections_of_the_mapping = () =>
- mapping.Collections.Single().Collection.ShouldEqual(Collection.Array);
+ mapping.Collections.Single().Collection.Should().Be(Collection.Array);
It should_use_the_property_name_as_the_collection_name = () =>
- mapping.Collections.Single().Name.ShouldEqual("ArrayOfChildren");
+ mapping.Collections.Single().Name.Should().Be("ArrayOfChildren");
It should_create_a_key_for_the_collection = () =>
- mapping.Collections.Single().Key.ShouldNotBeNull();
+ mapping.Collections.Single().Key.Should().NotBeNull();
It should_create_a_single_column_for_the_key = () =>
- mapping.Collections.Single().Key.Columns.Count().ShouldEqual(1);
+ mapping.Collections.Single().Key.Columns.Count().Should().Be(1);
It should_use_the_containing_type_name_suffixed_with_id_as_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("EntityWithCollections_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("EntityWithCollections_id");
It should_create_an_index_for_the_collection_mapping = () =>
- mapping.Collections.Single().Index.ShouldNotBeNull();
+ mapping.Collections.Single().Index.Should().NotBeNull();
It should_create_a_single_column_for_the_index = () =>
- mapping.Collections.Single().Index.Columns.Count().ShouldEqual(1);
+ mapping.Collections.Single().Index.Columns.Count().Should().Be(1);
It should_use_specified_property_as_the_index_column_name = () =>
- mapping.Collections.Single().Index.Columns.Single().Name.ShouldEqual("Position");
+ mapping.Collections.Single().Index.Columns.Single().Name.Should().Be("Position");
protected static ClassMappingBase mapping;
}
@@ -180,19 +181,19 @@ public class ClasslikeArrayBehaviour
public class HasManyElementBehaviour
{
It should_create_a_collection = () =>
- collection.ShouldNotBeNull();
+ collection.Should().NotBeNull();
It should_create_a_element_mapping_in_the_collection = () =>
- collection.Element.ShouldNotBeNull();
+ collection.Element.Should().NotBeNull();
It should_not_create_an_inner_relationship = () =>
- collection.Relationship.ShouldBeNull();
+ collection.Relationship.Should().BeNull();
It should_not_create_a_component = () =>
- collection.CompositeElement.ShouldBeNull();
+ collection.CompositeElement.Should().BeNull();
It should_use_the_default_column_name_for_the_element = () =>
- collection.Element.Columns.Single().Name.ShouldEqual("value");
+ collection.Element.Columns.Single().Name.Should().Be("value");
protected static CollectionMapping collection;
}
diff --git a/src/FluentNHibernate.Specs/FluentInterface/ComponentMapSpecs.cs b/src/FluentNHibernate.Specs/FluentInterface/ComponentMapSpecs.cs
index 041bdc1ef..dbca78653 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/ComponentMapSpecs.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/ComponentMapSpecs.cs
@@ -6,6 +6,7 @@
using FluentNHibernate.MappingModel;
using FluentNHibernate.MappingModel.ClassBased;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface
{
@@ -26,7 +27,7 @@ public class when_creating_the_mapping_for_a_component_using_component_map
mapping = (component as IExternalComponentMappingProvider).GetComponentMapping();
It should_create_an_external_component_mapping = () =>
- mapping.ShouldBeOfType();
+ mapping.Should().BeOfType();
It should_add_properties_to_the_properties_collection = () =>
mapping.Properties.ShouldContain(x => x.Name == "a_property");
@@ -45,7 +46,7 @@ public class when_creating_the_mapping_for_a_component_using_component_map
It should_add_references_to_the_references_collection = () =>
mapping.References.ShouldContain(x => x.Name == "a_reference");
-
+
private static ComponentMap component;
private static ComponentMapping mapping;
@@ -77,10 +78,10 @@ public class when_mapping_a_component_in_an_entity_without_defining_any_mappings
.Components.First();
It should_create_a_reference_component_mapping = () =>
- mapping.ShouldBeOfType();
+ mapping.Should().BeOfType();
It should_store_the_property_in_the_reference_component_mapping = () =>
- (mapping as ReferenceComponentMapping).Member.Name.ShouldBeEqualIgnoringCase("Component");
+ (mapping as ReferenceComponentMapping).Member.Name.Should().Be("Component");
private static ClassMap classmap;
private static IComponentMapping mapping;
@@ -120,13 +121,13 @@ public class when_compiling_the_mappings_with_a_reference_component_in_a_subclas
};
It should_add_the_subclass_to_the_class = () =>
- class_mapping.Subclasses.Count().ShouldEqual(1);
+ class_mapping.Subclasses.Count().Should().Be(1);
It should_merge_the_delegated_component_mapping_with_the_unassociated_component_mapping_from_the_component_map = () =>
{
var component_mapping = class_mapping.Subclasses.Single().Components.First();
- component_mapping.Member.Name.ShouldBeEqualIgnoringCase("Component");
+ component_mapping.Member.Name.Should().Be("Component");
component_mapping.Properties.ShouldContain(x => x.Name == "Property");
};
@@ -161,7 +162,7 @@ public class when_compiling_the_mappings_with_a_nested_reference_component_in_a_
ex = Catch.Exception(() => component_map.Component(x => x.Compo));
It should_throw_a_not_supported_exception = () =>
- ex.ShouldBeOfType();
+ ex.Should().BeOfType();
static ComponentMap component_map;
static Exception ex;
@@ -198,7 +199,7 @@ public class when_compiling_the_mappings_with_a_reference_component_and_a_relate
{
var component_mapping = class_mapping.Components.First();
- component_mapping.Member.Name.ShouldBeEqualIgnoringCase("Component");
+ component_mapping.Member.Name.Should().Be("Component");
component_mapping.Properties.ShouldContain(x => x.Name == "Property");
};
@@ -244,18 +245,18 @@ public class when_compiling_the_mappings_with_two_of_the_same_reference_componen
};
It should_merge_the_component_mappings_with_the_mapping_from_the_component_map = () =>
- class_mapping.Components.Select(x => x.Name).ShouldContain("ComponentA", "ComponentB");
+ class_mapping.Components.Select(x => x.Name).Should().Contain("ComponentA", "ComponentB");
It should_use_the_column_prefixes_for_the_columns = () =>
{
class_mapping.Components.First(x => x.Name == "ComponentA")
.Properties.SelectMany(x => x.Columns)
.Select(x => x.Name)
- .ShouldContain("A_PROP");
+ .Should().Contain("A_PROP");
class_mapping.Components.First(x => x.Name == "ComponentB")
.Properties.SelectMany(x => x.Columns)
.Select(x => x.Name)
- .ShouldContain("B_PROP");
+ .Should().Contain("B_PROP");
};
private static FluentNHibernate.PersistenceModel persistence_model;
@@ -306,13 +307,13 @@ public class when_compiling_the_mappings_with_multiple_nested_component_mappings
.Components.First(x => x.Name == "NestedComponent1")
.Properties.SelectMany(x => x.Columns)
.Select(x => x.Name)
- .ShouldContain("A_PROP1");
+ .Should().Contain("A_PROP1");
root_component
.Components.First(x => x.Name == "NestedComponent2")
.Properties.SelectMany(x => x.Columns)
.Select(x => x.Name)
- .ShouldContain("A_PROP2");
+ .Should().Contain("A_PROP2");
};
private static FluentNHibernate.PersistenceModel persistence_model;
diff --git a/src/FluentNHibernate.Specs/FluentInterface/ExternalComponentOutputSpecs.cs b/src/FluentNHibernate.Specs/FluentInterface/ExternalComponentOutputSpecs.cs
index fe0aee35c..a4198d95a 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/ExternalComponentOutputSpecs.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/ExternalComponentOutputSpecs.cs
@@ -5,6 +5,7 @@
using FluentNHibernate.MappingModel.Output;
using Machine.Specifications;
using Machine.Specifications.Model;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface
{
@@ -37,7 +38,7 @@ public class when_generating_the_output_for_a_resolved_component_reference
};
It should_be_rendered_the_same_as_an_inline_component = () =>
- referenced_xml.ShouldEqual(inline_xml);
+ referenced_xml.Should().Be(inline_xml);
private static string render_xml(Action addMappings)
@@ -48,7 +49,7 @@ private static string render_xml(Action addMa
var mappings = model.BuildMappings();
var doc = new MappingXmlSerializer().Serialize(mappings.First());
-
+
return doc.OuterXml;
}
diff --git a/src/FluentNHibernate.Specs/FluentInterface/SubclassMapSpecs/SubclassMapSpecs.HasMany.cs b/src/FluentNHibernate.Specs/FluentInterface/SubclassMapSpecs/SubclassMapSpecs.HasMany.cs
index 9b248a93c..388366076 100644
--- a/src/FluentNHibernate.Specs/FluentInterface/SubclassMapSpecs/SubclassMapSpecs.HasMany.cs
+++ b/src/FluentNHibernate.Specs/FluentInterface/SubclassMapSpecs/SubclassMapSpecs.HasMany.cs
@@ -2,6 +2,7 @@
using FluentNHibernate.MappingModel.ClassBased;
using FluentNHibernate.Specs.FluentInterface.Fixtures;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.FluentInterface.SubclassMapSpecs
{
@@ -13,7 +14,7 @@ public class when_subclass_map_is_told_to_map_a_has_many_bag : ProviderSpec
Behaves_like a_bag_in_a_classlike_mapping;
It should_use_the_containing_type_name_suffixed_with_id_as_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("EntityWithCollections_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("EntityWithCollections_id");
protected static SubclassMapping mapping;
}
@@ -60,7 +61,7 @@ public class when_subclass_map_is_told_to_map_an_has_many_from_a_field : Provide
Behaves_like a_bag_in_a_classlike_mapping;
It should_use_the_containing_type_name_suffixed_with_id_as_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("EntityWithFieldCollections_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("EntityWithFieldCollections_id");
protected static SubclassMapping mapping;
}
@@ -73,7 +74,7 @@ public class when_subclass_map_is_told_to_map_an_has_many_using_reveal : Provide
Behaves_like a_bag_in_a_classlike_mapping;
It should_use_the_containing_type_name_suffixed_with_id_as_the_key_column_name = () =>
- mapping.Collections.Single().Key.Columns.Single().Name.ShouldEqual("EntityWithCollections_id");
+ mapping.Collections.Single().Key.Columns.Single().Name.Should().Be("EntityWithCollections_id");
protected static SubclassMapping mapping;
}
diff --git a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
index 0e4e966b7..d176ba62e 100644
--- a/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
+++ b/src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj
@@ -1,199 +1,45 @@
-
-
+
+
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {D6C908E5-2B12-43DB-A8AB-2B6849D9CB7B}
- Library
- Properties
- FluentNHibernate.Specs
- FluentNHibernate.Specs
- v4.0
- 512
-
-
- 3.5
- false
- true
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- x86
- AllRules.ruleset
- 169,649
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- AllRules.ruleset
-
+ net461
+ 1591
+ AnyCpu
+ Full
+
+
+
+
-
- False
- ..\packages\Machine.Specifications.0.5.15\lib\net40\Machine.Specifications.dll
-
-
- ..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll
-
-
-
- 3.5
-
-
- 3.5
-
-
- 3.5
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {28BF853D-5B20-4091-A059-1CB0A028F981}
- FluentNHibernate.Specs.ExternalFixtures
-
-
- {529145D5-6CC3-4016-89B5-826563024AF1}
- FluentNHibernate
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
- False
- .NET Framework 3.5 SP1 Client Profile
- false
-
-
- False
- .NET Framework 3.5 SP1
- true
-
-
- False
- Windows Installer 3.1
- true
-
+
+ Properties\CommonAssemblyInfo.cs
+
+
-
+
-
-
+
\ No newline at end of file
diff --git a/src/FluentNHibernate.Specs/PersistenceModel/PersistenceModelSpecs.AddingProviders.cs b/src/FluentNHibernate.Specs/PersistenceModel/PersistenceModelSpecs.AddingProviders.cs
index 6f88b9812..f3ba5d731 100644
--- a/src/FluentNHibernate.Specs/PersistenceModel/PersistenceModelSpecs.AddingProviders.cs
+++ b/src/FluentNHibernate.Specs/PersistenceModel/PersistenceModelSpecs.AddingProviders.cs
@@ -1,4 +1,5 @@
-using FluentNHibernate.Mapping;
+using FluentAssertions;
+using FluentNHibernate.Mapping;
using FluentNHibernate.Specs.Automapping.Fixtures;
using Machine.Specifications;
@@ -10,7 +11,7 @@ public class when_the_persistence_model_has_a_component_added_by_type : Persiste
persistence_model.Add(typeof(MyComponentMap));
It should_contain_the_mapping = () =>
- persistence_model.ContainsMapping(typeof(MyComponentMap)).ShouldBeTrue();
+ persistence_model.ContainsMapping(typeof(MyComponentMap)).Should().BeTrue();
}
public class when_the_persistence_model_has_a_component_instance_added : PersistenceModelSpec
@@ -19,7 +20,7 @@ public class when_the_persistence_model_has_a_component_instance_added : Persist
persistence_model.Add(new MyComponentMap());
It should_contain_the_mapping = () =>
- persistence_model.ContainsMapping(typeof(MyComponentMap)).ShouldBeTrue();
+ persistence_model.ContainsMapping(typeof(MyComponentMap)).Should().BeTrue();
}
public class when_the_persistence_model_scans_a_source_for_types : PersistenceModelSpec
@@ -34,16 +35,16 @@ public class when_the_persistence_model_scans_a_source_for_types : PersistenceMo
}));
It should_contain_the_class_mapping = () =>
- persistence_model.ContainsMapping(typeof(MyClassMap)).ShouldBeTrue();
+ persistence_model.ContainsMapping(typeof(MyClassMap)).Should().BeTrue();
It should_contain_the_component_mapping = () =>
- persistence_model.ContainsMapping(typeof(MyComponentMap)).ShouldBeTrue();
+ persistence_model.ContainsMapping(typeof(MyComponentMap)).Should().BeTrue();
It should_contain_the_subclass_mapping = () =>
- persistence_model.ContainsMapping(typeof(MySubclassMap)).ShouldBeTrue();
+ persistence_model.ContainsMapping(typeof(MySubclassMap)).Should().BeTrue();
It should_contain_the_filter_mapping = () =>
- persistence_model.ContainsMapping(typeof(MyFilterMap)).ShouldBeTrue();
+ persistence_model.ContainsMapping(typeof(MyFilterMap)).Should().BeTrue();
}
public abstract class PersistenceModelSpec
diff --git a/src/FluentNHibernate.Specs/PersistenceModel/PersistenceModelSpecs.Validation.cs b/src/FluentNHibernate.Specs/PersistenceModel/PersistenceModelSpecs.Validation.cs
index 410798e66..157d7d611 100644
--- a/src/FluentNHibernate.Specs/PersistenceModel/PersistenceModelSpecs.Validation.cs
+++ b/src/FluentNHibernate.Specs/PersistenceModel/PersistenceModelSpecs.Validation.cs
@@ -3,6 +3,7 @@
using FluentNHibernate.Mapping;
using FluentNHibernate.Visitors;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.PersistenceModel
{
@@ -11,10 +12,10 @@ public class when_the_persistence_model_is_told_to_build_the_mappings_with_a_val
Establish context = () =>
{
model = new FluentNHibernate.PersistenceModel();
-
+
var class_map = new ClassMap();
class_map.Id(x => x.Id);
-
+
model.Add(class_map);
};
@@ -22,7 +23,7 @@ public class when_the_persistence_model_is_told_to_build_the_mappings_with_a_val
exception = Catch.Exception(() => model.BuildMappings());
It shouldnt_throw_any_validation_exceptions = () =>
- exception.ShouldBeNull();
+ exception.Should().BeNull();
}
public class when_the_persistence_model_is_told_to_build_the_mappings_with_a_class_mapping_that_doesnt_have_an_id : PersistenceModelValidationSpec
@@ -38,18 +39,18 @@ public class when_the_persistence_model_is_told_to_build_the_mappings_with_a_cla
It should_throw_a_validation_exception = () =>
{
- exception.ShouldNotBeNull();
- exception.ShouldBeOfType();
+ exception.Should().NotBeNull();
+ exception.Should().BeOfType();
};
It should_indicate_which_entity_is_missing_the_id = () =>
- exception.As().RelatedEntity.ShouldEqual(typeof(Target));
+ exception.As().RelatedEntity.Should().Be(typeof(Target));
It should_explain_how_to_correct_the_error = () =>
- exception.As().Resolution.ShouldEqual("Use the Id method to map your identity property. For example: Id(x => x.Id)");
+ exception.As().Resolution.Should().Be("Use the Id method to map your identity property. For example: Id(x => x.Id)");
It should_provide_a_sufficently_detailed_message_in_the_exception = () =>
- exception.Message.ShouldEqual("The entity 'Target' doesn't have an Id mapped. Use the Id method to map your identity property. For example: Id(x => x.Id).");
+ exception.Message.Should().Be("The entity 'Target' doesn't have an Id mapped. Use the Id method to map your identity property. For example: Id(x => x.Id).");
}
public class when_the_persistence_model_is_told_to_build_the_mappings_with_a_many_to_many_relationship_with_inverse_specified_on_both_sides : PersistenceModelValidationSpec
@@ -75,18 +76,18 @@ public class when_the_persistence_model_is_told_to_build_the_mappings_with_a_man
It should_throw_a_validation_exception = () =>
{
- exception.ShouldNotBeNull();
- exception.ShouldBeOfType();
+ exception.Should().NotBeNull();
+ exception.Should().BeOfType();
};
It should_indicate_which_entity_has_the_invalid_many_to_many = () =>
- exception.As().RelatedEntity.ShouldEqual(typeof(Left));
+ exception.As().RelatedEntity.Should().Be(typeof(Left));
It should_explain_how_to_correct_the_error = () =>
- exception.As().Resolution.ShouldEqual("Remove Inverse from one side of the relationship");
+ exception.As().Resolution.Should().Be("Remove Inverse from one side of the relationship");
It should_provide_a_sufficently_detailed_message_in_the_exception = () =>
- exception.Message.ShouldEqual("The relationship Left.Rights to Right.Lefts has Inverse specified on both sides. Remove Inverse from one side of the relationship.");
+ exception.Message.Should().Be("The relationship Left.Rights to Right.Lefts has Inverse specified on both sides. Remove Inverse from one side of the relationship.");
}
public class when_the_persistence_model_with_validation_disabled_is_told_to_build_the_mappings_with_a_class_mapping_that_doesnt_have_an_id : PersistenceModelValidationSpec
@@ -102,7 +103,7 @@ public class when_the_persistence_model_with_validation_disabled_is_told_to_buil
exception = Catch.Exception(() => model.BuildMappings());
It shouldnt_throw_any_validation_exceptions = () =>
- exception.ShouldBeNull();
+ exception.Should().BeNull();
}
public abstract class PersistenceModelValidationSpec
diff --git a/src/FluentNHibernate.Specs/PersistenceModel/SubclassSpecs.cs b/src/FluentNHibernate.Specs/PersistenceModel/SubclassSpecs.cs
index 998e5db7c..04763d034 100644
--- a/src/FluentNHibernate.Specs/PersistenceModel/SubclassSpecs.cs
+++ b/src/FluentNHibernate.Specs/PersistenceModel/SubclassSpecs.cs
@@ -8,6 +8,7 @@
using Machine.Specifications;
using NHibernate.Cfg;
using NHibernate.Tool.hbm2ddl;
+using FluentAssertions;
namespace FluentNHibernate.Specs.PersistenceModel
{
@@ -24,7 +25,7 @@ public class when_subclass_map_is_combined_with_a_class_map_flagged_as_union
mapping = model.BuildMappingFor();
It should_map_the_subclass_as_a_union_subclass = () =>
- mapping.Subclasses.Single().SubclassType.ShouldEqual(SubclassType.UnionSubclass);
+ mapping.Subclasses.Single().SubclassType.Should().Be(SubclassType.UnionSubclass);
static FluentNHibernate.PersistenceModel model;
static ClassMapping mapping;
@@ -56,7 +57,7 @@ public class when_subclass_map_has_a_has_many_to_another_entity
.Subclasses.Single()
.Collections.Single()
.Key.Columns.Select(x => x.Name)
- .ShouldContainOnly("SpecialProduct_id");
+ .Should().ContainSingle(name => name == "SpecialProduct_id");
static FluentNHibernate.PersistenceModel model;
static IEnumerable mappings;
diff --git a/src/FluentNHibernate.Specs/Properties/AssemblyInfo.cs b/src/FluentNHibernate.Specs/Properties/AssemblyInfo.cs
index 6f23ec0db..f53cc55a1 100644
--- a/src/FluentNHibernate.Specs/Properties/AssemblyInfo.cs
+++ b/src/FluentNHibernate.Specs/Properties/AssemblyInfo.cs
@@ -1,36 +1,9 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System;
+using System.Reflection;
using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
[assembly: AssemblyTitle("FluentNHibernate.Specs")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("FluentNHibernate.Specs")]
-[assembly: AssemblyCopyright("Copyright © 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("944abeed-c86d-4bc7-9b34-2bde0b4114e7")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: CLSCompliant(true)]
diff --git a/src/FluentNHibernate.Specs/SerializableSpecs.cs b/src/FluentNHibernate.Specs/SerializableSpecs.cs
index 4276b3b9a..b81f36691 100644
--- a/src/FluentNHibernate.Specs/SerializableSpecs.cs
+++ b/src/FluentNHibernate.Specs/SerializableSpecs.cs
@@ -5,6 +5,7 @@
using FluentNHibernate.MappingModel;
using FluentNHibernate.Utils;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs
{
@@ -20,7 +21,7 @@ public class for_serialization_to_occur
.Where(x => x.GetCustomAttributes(typeof(SerializableAttribute), false).Length == 0);
It should_have_all_mapping_types_marked_as_serializable = () =>
- unserializable_types.ShouldBeEmpty();
+ unserializable_types.Should().BeEmpty();
static IEnumerable mapping_types;
static IEnumerable unserializable_types;
diff --git a/src/FluentNHibernate.Specs/Utilities/MemberReflectionSpecs.cs b/src/FluentNHibernate.Specs/Utilities/MemberReflectionSpecs.cs
index 10be450fe..98a6db351 100644
--- a/src/FluentNHibernate.Specs/Utilities/MemberReflectionSpecs.cs
+++ b/src/FluentNHibernate.Specs/Utilities/MemberReflectionSpecs.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Utilities
{
@@ -11,53 +11,53 @@ public class when_getting_all_members_for_a_class
members = typeof(MyClass).GetInstanceMembers();
It should_include_the_public_properties = () =>
- members.Select(x => x.Name).ShouldContain("PublicProperty");
+ members.Select(x => x.Name).Should().Contain("PublicProperty");
It should_include_the_private_properties = () =>
- members.Select(x => x.Name).ShouldContain("PrivateProperty");
+ members.Select(x => x.Name).Should().Contain("PrivateProperty");
It should_include_the_protected_properties = () =>
- members.Select(x => x.Name).ShouldContain("ProtectedProperty");
+ members.Select(x => x.Name).Should().Contain("ProtectedProperty");
It should_include_the_public_fields = () =>
- members.Select(x => x.Name).ShouldContain("publicField");
+ members.Select(x => x.Name).Should().Contain("publicField");
It should_include_the_private_fields = () =>
- members.Select(x => x.Name).ShouldContain("privateField");
+ members.Select(x => x.Name).Should().Contain("privateField");
It should_include_the_protected_fields = () =>
- members.Select(x => x.Name).ShouldContain("protectedField");
-
+ members.Select(x => x.Name).Should().Contain("protectedField");
+
It should_not_include_backing_fields = () =>
- members.Select(x => x.Name).ShouldNotContain("k__BackingField");
+ members.Select(x => x.Name).Should().NotContain("k__BackingField");
It should_not_include_property_methods = () =>
- members.Select(x => x.Name).ShouldNotContain("get_PublicProperty", "set_PublicProperty");
-
+ members.Select(x => x.Name).Should().NotContain("get_PublicProperty", "set_PublicProperty");
+
It should_include_the_public_parameterless_non_void_methods = () =>
- members.Select(x => x.Name).ShouldContain("PublicNonVoidParameterlessMethod");
+ members.Select(x => x.Name).Should().Contain("PublicNonVoidParameterlessMethod");
It should_not_include_the_public_non_void_methods_with_parameters = () =>
- members.Select(x => x.Name).ShouldNotContain("PublicNonVoidMethodWithParameters");
+ members.Select(x => x.Name).Should().NotContain("PublicNonVoidMethodWithParameters");
It should_not_include_the_public_parameterless_void_methods = () =>
- members.Select(x => x.Name).ShouldNotContain("PublicVoidParameterlessMethod");
+ members.Select(x => x.Name).Should().NotContain("PublicVoidParameterlessMethod");
It should_not_include_the_public_void_methods_with_parameters = () =>
- members.Select(x => x.Name).ShouldNotContain("PublicVoidMethodWithParameters");
+ members.Select(x => x.Name).Should().NotContain("PublicVoidMethodWithParameters");
It should_include_the_private_parameterless_non_void_methods = () =>
- members.Select(x => x.Name).ShouldContain("PrivateNonVoidParameterlessMethod");
+ members.Select(x => x.Name).Should().Contain("PrivateNonVoidParameterlessMethod");
It should_not_include_the_private_non_void_methods_with_parameters = () =>
- members.Select(x => x.Name).ShouldNotContain("PrivateNonVoidMethodWithParameters");
+ members.Select(x => x.Name).Should().NotContain("PrivateNonVoidMethodWithParameters");
It should_not_include_the_private_parameterless_void_methods = () =>
- members.Select(x => x.Name).ShouldNotContain("PrivateVoidParameterlessMethod");
+ members.Select(x => x.Name).Should().NotContain("PrivateVoidParameterlessMethod");
It should_not_include_the_private_void_methods_with_parameters = () =>
- members.Select(x => x.Name).ShouldNotContain("PrivateVoidMethodWithParameters");
-
+ members.Select(x => x.Name).Should().NotContain("PrivateVoidMethodWithParameters");
+
static IEnumerable members;
class MyClass
@@ -117,28 +117,28 @@ public class when_getting_all_members_for_a_descendent_class
members = typeof(MyClass).GetInstanceMembers();
It should_include_the_public_properties_of_the_parent = () =>
- members.Select(x => x.Name).ShouldContain("PublicProperty");
+ members.Select(x => x.Name).Should().Contain("PublicProperty");
It should_include_the_private_properties_of_the_parent = () =>
- members.Select(x => x.Name).ShouldContain("PrivateProperty");
+ members.Select(x => x.Name).Should().Contain("PrivateProperty");
It should_include_the_protected_properties_of_the_parent = () =>
- members.Select(x => x.Name).ShouldContain("ProtectedProperty");
+ members.Select(x => x.Name).Should().Contain("ProtectedProperty");
It should_include_the_public_fields_of_the_parent = () =>
- members.Select(x => x.Name).ShouldContain("publicField");
+ members.Select(x => x.Name).Should().Contain("publicField");
It should_include_the_private_fields_of_the_parent = () =>
- members.Select(x => x.Name).ShouldContain("privateField");
+ members.Select(x => x.Name).Should().Contain("privateField");
It should_include_the_protected_fields_of_the_parent = () =>
- members.Select(x => x.Name).ShouldContain("protectedField");
+ members.Select(x => x.Name).Should().Contain("protectedField");
It should_include_the_public_parameterless_non_void_methods_of_the_parent = () =>
- members.Select(x => x.Name).ShouldContain("PublicNonVoidParameterlessMethod");
+ members.Select(x => x.Name).Should().Contain("PublicNonVoidParameterlessMethod");
It should_include_the_private_parameterless_non_void_methods_of_the_parent = () =>
- members.Select(x => x.Name).ShouldContain("PrivateNonVoidParameterlessMethod");
+ members.Select(x => x.Name).Should().Contain("PrivateNonVoidParameterlessMethod");
static IEnumerable members;
diff --git a/src/FluentNHibernate.Specs/Utilities/RevealSpecs.cs b/src/FluentNHibernate.Specs/Utilities/RevealSpecs.cs
index 6a57931cf..1d3646f6e 100644
--- a/src/FluentNHibernate.Specs/Utilities/RevealSpecs.cs
+++ b/src/FluentNHibernate.Specs/Utilities/RevealSpecs.cs
@@ -4,6 +4,7 @@
using FluentNHibernate.Utils;
using FluentNHibernate.Utils.Reflection;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Utilities
{
@@ -13,10 +14,10 @@ public class when_reveal_is_told_to_get_a_private_field
expression = Reveal.Member("privateField");
It should_return_an_expression_for_the_private_field = () =>
- expression.ShouldNotBeNull();
+ expression.Should().NotBeNull();
It should_create_an_expression_that_s_convertable_to_a_member = () =>
- expression.ToMember().Name.ShouldEqual("privateField");
+ expression.ToMember().Name.Should().Be("privateField");
static Expression> expression;
}
@@ -27,10 +28,10 @@ public class when_reveal_is_told_to_get_a_protected_field
expression = Reveal.Member("protectedField");
It should_return_an_expression_for_the_protected_field = () =>
- expression.ShouldNotBeNull();
+ expression.Should().NotBeNull();
It should_create_an_expression_that_s_convertable_to_a_member = () =>
- expression.ToMember().Name.ShouldEqual("protectedField");
+ expression.ToMember().Name.Should().Be("protectedField");
static Expression> expression;
}
@@ -41,10 +42,10 @@ public class when_reveal_is_told_to_get_a_public_field
expression = Reveal.Member("publicField");
It should_return_an_expression_for_the_public_field = () =>
- expression.ShouldNotBeNull();
+ expression.Should().NotBeNull();
It should_create_an_expression_that_s_convertable_to_a_member = () =>
- expression.ToMember().Name.ShouldEqual("publicField");
+ expression.ToMember().Name.Should().Be("publicField");
static Expression> expression;
}
@@ -55,10 +56,10 @@ public class when_reveal_is_told_to_get_a_private_property
expression = Reveal.Member("PrivateProperty");
It should_return_an_expression_for_the_private_property = () =>
- expression.ShouldNotBeNull();
+ expression.Should().NotBeNull();
It should_create_an_expression_that_s_convertable_to_a_member = () =>
- ReflectionHelper.GetMember(expression).Name.ShouldEqual("PrivateProperty");
+ ReflectionHelper.GetMember(expression).Name.Should().Be("PrivateProperty");
static Expression> expression;
}
@@ -69,10 +70,10 @@ public class when_reveal_is_told_to_get_a_protected_property
expression = Reveal.Member("ProtectedProperty");
It should_return_an_expression_for_the_protected_property = () =>
- expression.ShouldNotBeNull();
+ expression.Should().NotBeNull();
It should_create_an_expression_that_s_convertable_to_a_member = () =>
- ReflectionHelper.GetMember(expression).Name.ShouldEqual("ProtectedProperty");
+ ReflectionHelper.GetMember(expression).Name.Should().Be("ProtectedProperty");
static Expression> expression;
}
@@ -83,10 +84,10 @@ public class when_reveal_is_told_to_get_a_public_property
expression = Reveal.Member("PublicProperty");
It should_return_an_expression_for_the_public_property = () =>
- expression.ShouldNotBeNull();
+ expression.Should().NotBeNull();
It should_create_an_expression_that_s_convertable_to_a_member = () =>
- ReflectionHelper.GetMember(expression).Name.ShouldEqual("PublicProperty");
+ ReflectionHelper.GetMember(expression).Name.Should().Be("PublicProperty");
static Expression> expression;
}
@@ -97,10 +98,10 @@ public class when_reveal_is_told_to_get_an_int_property
expression = Reveal.Member("IntProperty");
It should_return_an_expression_for_the_public_property = () =>
- expression.ShouldNotBeNull();
+ expression.Should().NotBeNull();
It should_create_an_expression_that_s_convertable_to_a_member = () =>
- ReflectionHelper.GetMember(expression).Name.ShouldEqual("IntProperty");
+ ReflectionHelper.GetMember(expression).Name.Should().Be("IntProperty");
static Expression> expression;
}
@@ -111,10 +112,10 @@ public class when_reveal_is_told_to_get_property_from_a_super_class
expression = Reveal.Member("SuperProperty");
It should_return_an_expression_for_the_public_property = () =>
- expression.ShouldNotBeNull();
+ expression.Should().NotBeNull();
It should_create_an_expression_that_s_convertable_to_a_member = () =>
- ReflectionHelper.GetMember(expression).Name.ShouldEqual("SuperProperty");
+ ReflectionHelper.GetMember(expression).Name.Should().Be("SuperProperty");
static Expression> expression;
}
@@ -126,18 +127,18 @@ public class when_reveal_is_told_to_get_a_property_that_doesnt_exist
It should_throw_an_unknown_property_exception = () =>
{
- ex.ShouldNotBeNull();
- ex.ShouldBeOfType();
+ ex.Should().NotBeNull();
+ ex.Should().BeOfType();
};
It should_throw_an_exception_with_the_correct_message = () =>
- ex.Message.ShouldEqual("Could not find property 'UnknownProperty' on '" + typeof(Target).FullName + "'");
+ ex.Message.Should().Be("Could not find property 'UnknownProperty' on '" + typeof(Target).FullName + "'");
It should_throw_an_exception_with_it_s_property_set_to_the_expected_name = () =>
- ex.As().Property.ShouldEqual("UnknownProperty");
+ ex.As().Property.Should().Be("UnknownProperty");
It should_throw_an_exception_with_it_s_type_set_to_the_specified_type = () =>
- ex.As().Type.ShouldEqual(typeof(Target));
+ ex.As().Type.Should().Be(typeof(Target));
static Exception ex;
}
diff --git a/src/FluentNHibernate.Specs/Visitors/BiDirectionalManyToManyPairingVisitorSpecs.cs b/src/FluentNHibernate.Specs/Visitors/BiDirectionalManyToManyPairingVisitorSpecs.cs
index 5dae5dc61..f9235f0a6 100644
--- a/src/FluentNHibernate.Specs/Visitors/BiDirectionalManyToManyPairingVisitorSpecs.cs
+++ b/src/FluentNHibernate.Specs/Visitors/BiDirectionalManyToManyPairingVisitorSpecs.cs
@@ -6,6 +6,7 @@
using FluentNHibernate.Utils;
using FluentNHibernate.Visitors;
using Machine.Specifications;
+using FluentAssertions;
namespace FluentNHibernate.Specs.Visitors
{
@@ -24,19 +25,19 @@ public class when_the_bi_directional_many_to_many_visitor_is_asked_to_pair_two_m
Visit(members_in_queue, supervisors_in_queue, membership_queues_in_user, supervised_queues_in_user);
It should_call_the_user_defined_func = () =>
- udf_was_called.ShouldBeTrue();
+ udf_was_called.Should().BeTrue();
It should_set_other_side_for_the_members_collection = () =>
- members_in_queue.OtherSide.ShouldEqual(membership_queues_in_user);
+ members_in_queue.OtherSide.Should().Be(membership_queues_in_user);
It should_set_other_side_for_the_supervisors_collection = () =>
- supervisors_in_queue.OtherSide.ShouldEqual(supervised_queues_in_user);
+ supervisors_in_queue.OtherSide.Should().Be(supervised_queues_in_user);
It should_set_other_side_for_the_membership_queues_collection = () =>
- membership_queues_in_user.OtherSide.ShouldEqual(members_in_queue);
+ membership_queues_in_user.OtherSide.Should().Be(members_in_queue);
It should_set_other_side_for_the_supervisored_queues_collection = () =>
- supervised_queues_in_user.OtherSide.ShouldEqual(supervisors_in_queue);
+ supervised_queues_in_user.OtherSide.Should().Be(supervisors_in_queue);
static CollectionMapping members_in_queue;
static CollectionMapping supervisors_in_queue;
@@ -71,17 +72,17 @@ public class when_the_bi_directional_many_to_many_visitor_is_asked_to_pair_two_m
ex = Catch.Exception(() => Visit(fish_in_queue, chips_in_queue, bacon_in_queue, eggs_in_queue));
It should_not_fail = () =>
- ex.ShouldBeNull();
+ ex.Should().BeNull();
It should_call_the_user_defined_func = () =>
- udf_was_called.ShouldBeTrue();
+ udf_was_called.Should().BeTrue();
It shouldnt_set_the_other_side_of_any_of_the_relationships = () =>
{
- fish_in_queue.OtherSide.ShouldBeNull();
- chips_in_queue.OtherSide.ShouldBeNull();
- bacon_in_queue.OtherSide.ShouldBeNull();
- eggs_in_queue.OtherSide.ShouldBeNull();
+ fish_in_queue.OtherSide.Should().BeNull();
+ chips_in_queue.OtherSide.Should().BeNull();
+ bacon_in_queue.OtherSide.Should().BeNull();
+ eggs_in_queue.OtherSide.Should().BeNull();
};
static CollectionMapping fish_in_queue;
@@ -118,17 +119,17 @@ public class when_the_bi_directional_many_to_many_visitor_is_asked_to_pair_two_m
ex = Catch.Exception(() => Visit(dsers_in_queue, fsers_in_queue, wueues_in_user, eueues_in_user));
It should_not_fail = () =>
- ex.ShouldBeNull();
+ ex.Should().BeNull();
It should_call_the_user_defined_func = () =>
- udf_was_called.ShouldBeTrue();
+ udf_was_called.Should().BeTrue();
It shouldnt_set_the_other_side_of_any_of_the_relationships = () =>
{
- dsers_in_queue.OtherSide.ShouldBeNull();
- fsers_in_queue.OtherSide.ShouldBeNull();
- wueues_in_user.OtherSide.ShouldBeNull();
- eueues_in_user.OtherSide.ShouldBeNull();
+ dsers_in_queue.OtherSide.Should().BeNull();
+ fsers_in_queue.OtherSide.Should().BeNull();
+ wueues_in_user.OtherSide.Should().BeNull();
+ eueues_in_user.OtherSide.Should().BeNull();
};
static CollectionMapping dsers_in_queue;
@@ -164,16 +165,16 @@ public class when_the_bi_directional_many_to_many_visitor_is_asked_to_pair_a_man
Visit(queues_in_user, users2_in_queue, users_in_queue);
It should_call_the_user_defined_func = () =>
- udf_was_called.ShouldBeTrue();
+ udf_was_called.Should().BeTrue();
It should_link_queues_in_user_to_the_most_similar_member_in_the_other_entity = () =>
- queues_in_user.OtherSide.ShouldEqual(users_in_queue);
+ queues_in_user.OtherSide.Should().Be(users_in_queue);
It should_link_users_in_queue_to_the_most_similar_member_in_the_other_entity = () =>
- users_in_queue.OtherSide.ShouldEqual(queues_in_user);
+ users_in_queue.OtherSide.Should().Be(queues_in_user);
It shouldnt_link_the_orphaned_member_with_anything = () =>
- users2_in_queue.OtherSide.ShouldBeNull();
+ users2_in_queue.OtherSide.Should().BeNull();
static CollectionMapping users_in_queue;
static CollectionMapping users2_in_queue;
@@ -203,13 +204,13 @@ public class when_the_bi_directional_many_to_many_visitor_is_asked_to_pair_a_sel
Visit(descendants, ancestors);
It should_call_the_user_defined_func = () =>
- udf_was_called.ShouldBeTrue();
+ udf_was_called.Should().BeTrue();
It should_link_ancestors_to_descendants = () =>
- ancestors.OtherSide.ShouldEqual(descendants);
+ ancestors.OtherSide.Should().Be(descendants);
It should_link_descendants_to_ancestors = () =>
- descendants.OtherSide.ShouldEqual(ancestors);
+ descendants.OtherSide.Should().Be(ancestors);
static CollectionMapping ancestors;
static CollectionMapping descendants;
@@ -233,13 +234,13 @@ public class when_the_bi_directional_many_to_many_visitor_is_asked_to_pair_two_c
Visit(users_in_queue, queues_in_user);
It should_call_the_user_defined_func = () =>
- udf_was_called.ShouldBeTrue();
+ udf_was_called.Should().BeTrue();
It should_set_other_side_for_the_users_collection = () =>
- users_in_queue.OtherSide.ShouldEqual(queues_in_user);
+ users_in_queue.OtherSide.Should().Be(queues_in_user);
It should_set_other_side_for_the_queues_collection = () =>
- queues_in_user.OtherSide.ShouldEqual(users_in_queue);
+ queues_in_user.OtherSide.Should().Be(users_in_queue);
static CollectionMapping users_in_queue;
static CollectionMapping queues_in_user;
@@ -270,12 +271,12 @@ protected static CollectionMapping collection(Expression> exp
var member = expression.ToMember();
var bag = CollectionMapping.Bag();
-
+
bag.ContainingEntityType = typeof(T);
bag.Member = member;
bag.Set(x => x.Relationship, Layer.Defaults, new ManyToManyMapping());
bag.Set(x => x.ChildType, Layer.Defaults, member.PropertyType.GetGenericArguments()[0]);
-
+
return bag;
}
diff --git a/src/FluentNHibernate.Specs/packages.config b/src/FluentNHibernate.Specs/packages.config
deleted file mode 100644
index 64380435a..000000000
--- a/src/FluentNHibernate.Specs/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/FluentNHibernate.Testing/App.config b/src/FluentNHibernate.Testing/App.config
index e53694f3d..a94ae6dea 100644
--- a/src/FluentNHibernate.Testing/App.config
+++ b/src/FluentNHibernate.Testing/App.config
@@ -1,20 +1,35 @@
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Components.cs b/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Components.cs
index 076a45fc5..c32904fed 100644
--- a/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Components.cs
+++ b/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Components.cs
@@ -148,9 +148,9 @@ public void ComponentColumnConventionReceivesProperty()
[Test]
public void JoinedSubclassOverrideShouldOverrideExistingComponent()
{
+#pragma warning disable 612,618
var autoMapper = AutoMap.AssemblyOf()
.Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
-#pragma warning disable 612,618
.Setup(x => x.IsComponentType = type => type == typeof(ExampleParentClass))
#pragma warning restore 612,618
.Override(m => m.Component(x => x.Component, c => c.Map(x => x.ExampleParentClassId).Column("test")));
diff --git a/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Inheritance.cs b/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Inheritance.cs
index c0c8c7545..2d0a4949a 100644
--- a/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Inheritance.cs
+++ b/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Inheritance.cs
@@ -17,18 +17,18 @@ public partial class AutoPersistenceModelTests : BaseAutoPersistenceTests
#region inheritance
[Test]
- [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "Could not find mapping for class 'SuperType'")]
public void TestInheritanceMappingSkipsSuperTypes()
{
var autoMapper = AutoMap.AssemblyOf()
.Where(t => t.Namespace == "FluentNHibernate.AutoMap.TestFixtures.SuperTypes")
.IgnoreBase();
- new AutoMappingTester(autoMapper);
+ Assert.That(() => new AutoMappingTester(autoMapper),
+ Throws.TypeOf()
+ .With.Message.EqualTo("Could not find mapping for class 'SuperType'"));
}
[Test]
- [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "Could not find mapping for class 'SuperType'")]
public void TestInheritanceSubclassMappingSkipsSuperTypes()
{
var autoMapper = AutoMap.AssemblyOf()
@@ -39,7 +39,9 @@ public void TestInheritanceSubclassMappingSkipsSuperTypes()
c.IsDiscriminated = type => true;
});
- new AutoMappingTester(autoMapper);
+ Assert.That(() => new AutoMappingTester(autoMapper),
+ Throws.TypeOf()
+ .With.Message.EqualTo("Could not find mapping for class 'SuperType'"));
}
[Test]
diff --git a/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Overrides.cs b/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Overrides.cs
index 3ba771e88..2185a3650 100644
--- a/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Overrides.cs
+++ b/src/FluentNHibernate.Testing/AutoMapping/Apm/AutoPersistenceModelTests.Overrides.cs
@@ -10,18 +10,18 @@ namespace FluentNHibernate.Testing.AutoMapping.Apm
public partial class AutoPersistenceModelTests : BaseAutoPersistenceTests
{
[Test]
- public void NaturalIdOverrideShouldOverrideExistingProperty()
- {
- var autoMapper = AutoMap.AssemblyOf()
- .Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
- .Override(c => c.NaturalId().Property(x => x.LineOne, "test"));
-
- new AutoMappingTester(autoMapper)
- .Element("//natural-id/property[@name='LineOne']")
- .Exists()
- .HasThisManyChildNodes(1)
- .Element("//natural-id/property[@name='LineOne']/column").HasAttribute("name", "test");
- }
+ public void NaturalIdOverrideShouldOverrideExistingProperty()
+ {
+ var autoMapper = AutoMap.AssemblyOf()
+ .Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
+ .Override(c => c.NaturalId().Property(x => x.LineOne, "test"));
+
+ new AutoMappingTester(autoMapper)
+ .Element("//natural-id/property[@name='LineOne']")
+ .Exists()
+ .HasThisManyChildNodes(1)
+ .Element("//natural-id/property[@name='LineOne']/column").HasAttribute("name", "test");
+ }
[Test]
public void OverrideShouldOverrideExistingProperty()
@@ -244,9 +244,9 @@ public void JoinedSubclassOverrideShouldOverrideExistingReferencesAny()
[Test]
public void SubclassOverrideShouldOverrideExistingProperty()
{
+#pragma warning disable 612,618
var autoMapper = AutoMap.AssemblyOf()
.Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
-#pragma warning disable 612,618
.Setup(x => x.IsDiscriminated = type => true)
#pragma warning restore 612,618
.Override(c => c.Map(x => x.ExampleProperty).Column("test"));
@@ -261,9 +261,9 @@ public void SubclassOverrideShouldOverrideExistingProperty()
[Test]
public void SubclassOverrideShouldOverrideExistingComponent()
{
+#pragma warning disable 612,618
var autoMapper = AutoMap.AssemblyOf()
.Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
-#pragma warning disable 612,618
.Setup(x =>
{
x.IsDiscriminated = type => true;
@@ -279,9 +279,9 @@ public void SubclassOverrideShouldOverrideExistingComponent()
[Test]
public void SubclassOverrideShouldOverrideExistingHasMany()
{
+#pragma warning disable 612,618
var autoMapper = AutoMap.AssemblyOf()
.Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
-#pragma warning disable 612,618
.Setup(x => x.IsDiscriminated = type => true)
#pragma warning restore 612,618
.Override(m => m.HasMany(x => x.Children).Inverse());
@@ -293,9 +293,9 @@ public void SubclassOverrideShouldOverrideExistingHasMany()
[Test]
public void SubclassOverrideShouldOverrideExistingHasManyToMany()
{
+#pragma warning disable 612,618
var autoMapper = AutoMap.AssemblyOf()
.Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
-#pragma warning disable 612,618
.Setup(x => x.IsDiscriminated = type => true)
#pragma warning restore 612,618
.Override(m => m.HasManyToMany(x => x.Children).Inverse());
@@ -308,9 +308,9 @@ public void SubclassOverrideShouldOverrideExistingHasManyToMany()
[Test]
public void SubclassOverrideShouldOverrideExistingHasOne()
{
+#pragma warning disable 612,618
var autoMapper = AutoMap.AssemblyOf()
.Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
-#pragma warning disable 612,618
.Setup(x => x.IsDiscriminated = type => true)
#pragma warning restore 612,618
.Override(m => m.HasOne(x => x.Parent));
@@ -323,9 +323,9 @@ public void SubclassOverrideShouldOverrideExistingHasOne()
[Test]
public void SubclassOverrideShouldOverrideExistingReferences()
{
+#pragma warning disable 612, 618
var autoMapper = AutoMap.AssemblyOf()
.Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
-#pragma warning disable 612,618
.Setup(x => x.IsDiscriminated = type => true)
#pragma warning restore 612,618
.Override(m => m.References(x => x.Parent).Access.Field());
@@ -337,9 +337,9 @@ public void SubclassOverrideShouldOverrideExistingReferences()
[Test]
public void SubclassOverrideShouldOverrideExistingReferencesAny()
{
+#pragma warning disable 612, 618
var autoMapper = AutoMap.AssemblyOf()
.Where(t => t.Namespace == "FluentNHibernate.Automapping.TestFixtures")
-#pragma warning disable 612,618
.Setup(x => x.IsDiscriminated = type => true)
#pragma warning restore 612,618
.Override(m =>
diff --git a/src/FluentNHibernate.Testing/AutoMapping/DefaultAutoMappingConfigurationTests.cs b/src/FluentNHibernate.Testing/AutoMapping/DefaultAutoMappingConfigurationTests.cs
index 58d73a6dc..994edaf99 100644
--- a/src/FluentNHibernate.Testing/AutoMapping/DefaultAutoMappingConfigurationTests.cs
+++ b/src/FluentNHibernate.Testing/AutoMapping/DefaultAutoMappingConfigurationTests.cs
@@ -12,7 +12,7 @@ public class DefaultAutoMappingConfigurationTests
{
IAutomappingConfiguration configuration;
- [TestFixtureSetUp]
+ [SetUp]
public void FixtureSetUp()
{
configuration = new DefaultAutomappingConfiguration();
diff --git a/src/FluentNHibernate.Testing/AutoMapping/Overrides/HibernateMappingOverrides.cs b/src/FluentNHibernate.Testing/AutoMapping/Overrides/HibernateMappingOverrides.cs
index 22d137423..d590fd3f9 100644
--- a/src/FluentNHibernate.Testing/AutoMapping/Overrides/HibernateMappingOverrides.cs
+++ b/src/FluentNHibernate.Testing/AutoMapping/Overrides/HibernateMappingOverrides.cs
@@ -11,7 +11,7 @@ namespace FluentNHibernate.Testing.AutoMapping.Overrides
[TestFixture]
public class HibernateMappingOverrides
{
- [Test, Ignore]
+ [Test, Ignore("CanOverrideDefaultLazy")]
public void CanOverrideDefaultLazy()
{
var model = AutoMap.Source(new StubTypeSource(new[] { typeof(Parent) }))
diff --git a/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs b/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs
index 1ad5094f9..749169dc9 100644
--- a/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs
+++ b/src/FluentNHibernate.Testing/AutoMapping/TestFixtures.cs
@@ -16,6 +16,7 @@
using NHibernate.SqlTypes;
using NHibernate.Type;
using NHibernate.UserTypes;
+using System.Data.Common;
namespace FluentNHibernate.Automapping.TestFixtures
{
@@ -118,7 +119,7 @@ public enum ExampleEnum
public class ExampleParentClass
{
- public int ExampleParentClassId { get; set; }
+ public int ExampleParentClassId { get; set; }
public virtual int Id { get; set; }
public virtual IList Examples {get; set;}
}
@@ -154,7 +155,7 @@ public class ClassWithUserType
public Custom Custom { get; set; }
}
-
+
public class ClassWithCompositeUserType
{
@@ -268,7 +269,7 @@ public object NullSafeGet(IDataReader rs, string[] names, object owner)
public void NullSafeSet(IDbCommand cmd, object value, int index)
{
-
+
}
public object DeepCopy(object value)
@@ -291,6 +292,16 @@ public object Disassemble(object value)
return value;
}
+ public object NullSafeGet(DbDataReader rs, string[] names, ISessionImplementor session, object owner)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void NullSafeSet(DbCommand cmd, object value, int index, ISessionImplementor session)
+ {
+ throw new NotImplementedException();
+ }
+
public SqlType[] SqlTypes
{
get { return new[] {new SqlType(DbType.String)}; }
@@ -352,31 +363,21 @@ public bool IsMutable
get { return true; }
}
- public Object NullSafeGet(IDataReader rs, string[] names, ISessionImplementor session, Object owner)
+ public object NullSafeGet(DbDataReader dr, string[] names, ISessionImplementor session, object owner)
{
- string first = (string)NHibernateUtil.String.NullSafeGet(rs, names[0], session, owner);
- string second = (string)NHibernateUtil.String.NullSafeGet(rs, names[1], session, owner);
+ string first = (string)NHibernateUtil.String.NullSafeGet(dr, names[0], session, owner);
+ string second = (string)NHibernateUtil.String.NullSafeGet(dr, names[1], session, owner);
return (first == null && second == null) ? null : new string[] { first, second };
}
-#if NH21
- public void NullSafeSet(IDbCommand st, Object value, int index, ISessionImplementor session)
- {
- DoubleString ds = value as DoubleString ?? new DoubleString();
-
- NHibernateUtil.String.NullSafeSet(st, ds.s1, index, session);
- NHibernateUtil.String.NullSafeSet(st, ds.s2, index + 1, session);
- }
-#else
- public void NullSafeSet(IDbCommand st, Object value, int index, bool[] unknown, ISessionImplementor session)
+ public void NullSafeSet(DbCommand cmd, object value, int index, bool[] settable, ISessionImplementor session)
{
DoubleString ds = value as DoubleString ?? new DoubleString();
- NHibernateUtil.String.NullSafeSet(st, ds.s1, index, session);
- NHibernateUtil.String.NullSafeSet(st, ds.s2, index + 1, session);
+ NHibernateUtil.String.NullSafeSet(cmd, ds.s1, index, session);
+ NHibernateUtil.String.NullSafeSet(cmd, ds.s2, index + 1, session);
}
-#endif
public string[] PropertyNames
{
@@ -464,7 +465,7 @@ public enum ExampleEnum
public class ExampleParentClass : SuperType
{
- public int ExampleParentClassId { get; set; }
+ public int ExampleParentClassId { get; set; }
public virtual IList Examples {get; set;}
}
@@ -520,7 +521,7 @@ public class ManyToMany
public enum PublisherType
{
- Online,
+ Online,
Offline,
Mixed
}
diff --git a/src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/IdConventionTests.cs b/src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/IdConventionTests.cs
index 083d668d4..5c7ec3b79 100644
--- a/src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/IdConventionTests.cs
+++ b/src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/IdConventionTests.cs
@@ -1,6 +1,8 @@
using System;
using System.Linq;
using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
using FluentNHibernate.Automapping.TestFixtures;
using FluentNHibernate.Automapping.TestFixtures.CustomTypes;
using FluentNHibernate.Conventions.Helpers.Builders;
@@ -192,6 +194,11 @@ public object Generate(ISessionImplementor session, object obj)
{
return null;
}
+
+ public Task
-=============================================
-
-Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate. *Get your fluent on.*
-
-
-Getting started
----------------------------------------------
-
-* Read the [introduction](https://github.com/jagregory/fluent-nhibernate/wiki/Getting-started).
-* Get latest binaries from NuGet (we support both [.NET 4.0 with NHibernate 4.x](https://www.nuget.org/packages/FluentNHibernate) and [.NET 3.5 with NHibernate 3 if you like it vintage] (https://www.nuget.org/packages/FluentNHibernate.Net35))
-* Create your [first project](https://github.com/jagregory/fluent-nhibernate/wiki/Getting-started#wiki-yourfirstproject).
-
-
-Further reading
----------------------------------------------
-
-Once you've followed the above, you can compare our [auto mapping](https://github.com/jagregory/fluent-nhibernate/wiki/Auto-mapping) to our [fluent interface](https://github.com/jagregory/fluent-nhibernate/wiki/Fluent-mapping) to see which suits your application, read through our [API documentation](https://github.com/jagregory/fluent-nhibernate/wiki/Fluent-configuration), or just see what's available for reading in our [wiki](https://github.com/jagregory/fluent-nhibernate/wiki).
-
-
-Building
----------------------------------------------
-Follow the instructions from the [wiki page](https://github.com/jagregory/fluent-nhibernate/wiki/Building) to build the project.
-
-
-Contributors
----------------------------------------------
-
-Fluent NHibernate wouldn't be possible without the time and effort of its contributors. The team comprises of [James Gregory](http://jagregory.com), [Paul Batum](http://www.paulbatum.com), Andrew Stewart, and [Hudson Akridge](http://www.bestguesstheory.com).
-
-**Our valued committers are:** Aaron Jensen, Alexander Gross, Andrew Stewart, Barry Dahlberg, Bobby Johnson, Brian Donahue, Cameron Harris, Chad Myers, Chris Chilvers, Craig Neuwirt, Dan Malcolm, Daniel Mirapalheta, David Archer, David Longnecker, David R. Longnecker, Derick Bailey, Erik Ojebo, Firo, Hudson Akridge, Ivan Zlatev, James Freiwirth, James Gregory, James Kovacs, Jeremy Skinner, Lee Henson, Louis DeJardin, Patric Forsgard, Paul Batum, Roelof Blom, Stuart Childs, Tom Janssens, Tuna Toksoz, U-BSOD\pruiz, di97mni, dschilling, felixg, jeremydmiller, kevm, leebrandt, maxild, and robsosno.
-
-Thanks goes to [Jeremy Miller](http://codebetter.com/blogs/jeremy.miller) for the original idea and implementation.
-
-Fluent NHibernate is © 2008-2015 [James Gregory](http://jagregory.com) and contributors under the [BSD license](fluent-nhibernate/blob/master/LICENSE.txt)
-
-