From c6dcc7422bfaaf1038f1463e0ad06c2a2aafaa69 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Fri, 6 Mar 2020 18:57:27 +0000 Subject: [PATCH 1/3] Trivial - remove unused files --- CSF.ORM.sln | 3 --- Tools/build.sh | 17 ----------------- Tools/common-vars.txt | 2 -- Tools/install.sh | 4 ---- 4 files changed, 26 deletions(-) delete mode 100755 Tools/build.sh delete mode 100644 Tools/common-vars.txt delete mode 100755 Tools/install.sh diff --git a/CSF.ORM.sln b/CSF.ORM.sln index cce5dcd..1a82740 100644 --- a/CSF.ORM.sln +++ b/CSF.ORM.sln @@ -15,10 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSF.ORM.Tests", "Tests\CSF. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{671772C1-0FCB-4B27-846D-329CBA7A1845}" ProjectSection(SolutionItems) = preProject - Tools\build.sh = Tools\build.sh - Tools\common-vars.txt = Tools\common-vars.txt Tools\EnableNet45BuildOnUnix.targets = Tools\EnableNet45BuildOnUnix.targets - Tools\install.sh = Tools\install.sh EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.ORM.Entities", "CSF.ORM.Entities\CSF.ORM.Entities.csproj", "{3EF001E2-A559-42DB-A2DB-1A8629E7486D}" diff --git a/Tools/build.sh b/Tools/build.sh deleted file mode 100755 index d0f285c..0000000 --- a/Tools/build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -SCRIPT_PATH="$(dirname $0)" -source "$SCRIPT_PATH/common-vars.txt" -CONFIGURATION="${1:-Debug}" - -function core_build() { - cd "$PROJECT_ROOT" - dotnet build -c "$CONFIGURATION" -} - -function run_tests() { - dotnet test -} - -core_build -run_tests diff --git a/Tools/common-vars.txt b/Tools/common-vars.txt deleted file mode 100644 index 14c7640..0000000 --- a/Tools/common-vars.txt +++ /dev/null @@ -1,2 +0,0 @@ -SCRIPT_PATH="$(dirname $0)" -PROJECT_ROOT="$SCRIPT_PATH/.." diff --git a/Tools/install.sh b/Tools/install.sh deleted file mode 100755 index 26b2e22..0000000 --- a/Tools/install.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -SCRIPT_PATH="$(dirname $0)" -source "$SCRIPT_PATH/common-vars.txt" From a5f71b20dda9101114475df6c2a065e7c6c26ef4 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Thu, 23 Apr 2020 18:10:28 +0100 Subject: [PATCH 2/3] Resolve #38 - Fix issues, include file & add test coverage This resolves the problem where a file was accidentally not included in the compiled library. It also had a few issues/bugs which were not apparent previously (because it had not been built). I have also added some happy-path test coverage for it as well, while I was re-enabling it anyway. --- CSF.Entities/CSF.Entities.csproj | 6 ------ CSF.Entities/Identity.cs | 4 ++-- Tests/CSF.Entities.Tests/IdentityTests.cs | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/CSF.Entities/CSF.Entities.csproj b/CSF.Entities/CSF.Entities.csproj index 6412a76..4175e3b 100644 --- a/CSF.Entities/CSF.Entities.csproj +++ b/CSF.Entities/CSF.Entities.csproj @@ -49,9 +49,6 @@ Strings.resx.resources - - - ExceptionMessages.resx @@ -63,7 +60,4 @@ - - - \ No newline at end of file diff --git a/CSF.Entities/Identity.cs b/CSF.Entities/Identity.cs index f5c3b0c..1c23ff9 100644 --- a/CSF.Entities/Identity.cs +++ b/CSF.Entities/Identity.cs @@ -37,7 +37,7 @@ public static class Identity { static readonly IGetsIdentityType identityTypeProvider = new IdentityTypeProvider(); static readonly ICreatesIdentity identityFactory = new IdentityFactory(); - static readonly IUpCastsIdentity caster = new IdentityCaster(); + static readonly ICastsIdentityType caster = new IdentityTypeCaster(); static readonly IParsesIdentity parser = new IdentityParser(); /// @@ -69,7 +69,7 @@ public static IIdentity Parse(object value) where TEntity : IE /// The identity to convert to a different entity type. /// The desired entity type. /// If the is not suitable for the entity type . - public static IIdentity Cast(this IIdentity identity) + public static IIdentity Cast(this IIdentity identity) where TCast : IEntity => caster.CastIdentity(identity); } } diff --git a/Tests/CSF.Entities.Tests/IdentityTests.cs b/Tests/CSF.Entities.Tests/IdentityTests.cs index 6939fee..43ab5f3 100644 --- a/Tests/CSF.Entities.Tests/IdentityTests.cs +++ b/Tests/CSF.Entities.Tests/IdentityTests.cs @@ -37,6 +37,7 @@ public void Equals_returns_false_for_two_identities_with_incompatible_entity_typ var identity2 = new Identity(5); Assert.That(identity1.Equals(identity2), Is.False); } + [Test, AutoMoqData] public void Equals_operator_returns_true_for_two_equal_identities() { @@ -69,6 +70,27 @@ public void Equals_operator_returns_false_for_two_identities_with_incompatible_e Assert.That(identity1 == identity2, Is.False); } + [Test, AutoMoqData] + public void Create_creates_identity_with_correct_value() + { + var identity = Identity.Create(5); + Assert.That(identity.Value, Is.EqualTo(5)); + } + + [Test, AutoMoqData] + public void Parse_returns_identity_with_correct_value() + { + var identity = Identity.Parse("66"); + Assert.That(identity.Value, Is.EqualTo(66)); + } + + [Test, AutoMoqData] + public void Cast_returns_appropriate_identity() + { + var identity = new Identity(5); + Assert.That(() => Identity.Cast(identity).Value, Is.EqualTo(5)); + } + [Test, AutoMoqData] public void GetValueAsString_returns_correct_value() { From c8e22c72bd651e47109cd2687d4a419b6b31300d Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Thu, 23 Apr 2020 19:02:27 +0100 Subject: [PATCH 3/3] Bump version number --- CSF.Entities/CSF.Entities.csproj | 2 +- CSF.ORM.Entities/CSF.ORM.Entities.csproj | 2 +- CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj | 2 +- CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj | 2 +- CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj | 2 +- CSF.ORM.sln | 2 +- CSF.ORM/CSF.ORM.csproj | 2 +- .../CSF.PersistenceTester.Core.csproj | 2 +- .../CSF.PersistenceTester.NUnit.csproj | 2 +- Tests/CSF.CommonTestLogic/CSF.CommonTestLogic.csproj | 2 +- Tests/CSF.Entities.Tests/CSF.Entities.Tests.csproj | 2 +- .../CSF.ORM.NHibernate4.Tests/CSF.ORM.NHibernate4.Tests.csproj | 2 +- .../CSF.ORM.NHibernate5.Tests/CSF.ORM.NHibernate5.Tests.csproj | 2 +- Tests/CSF.ORM.Tests/CSF.ORM.Tests.csproj | 2 +- .../CSF.PersistenceTester.IntegrationTests.csproj | 2 +- .../CSF.PersistenceTester.Tests.csproj | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CSF.Entities/CSF.Entities.csproj b/CSF.Entities/CSF.Entities.csproj index 4175e3b..58874cd 100644 --- a/CSF.Entities/CSF.Entities.csproj +++ b/CSF.Entities/CSF.Entities.csproj @@ -11,7 +11,7 @@ craigfowler Entity & identity types Interfaces & base types to describe ORM-mapped entities and their identities. - 2.0.1 + 2.0.2 $(ReleaseVersion) $(ReleaseVersion) MIT diff --git a/CSF.ORM.Entities/CSF.ORM.Entities.csproj b/CSF.ORM.Entities/CSF.ORM.Entities.csproj index 349a1e3..e1bcebb 100644 --- a/CSF.ORM.Entities/CSF.ORM.Entities.csproj +++ b/CSF.ORM.Entities/CSF.ORM.Entities.csproj @@ -13,7 +13,7 @@ craigfowler ORM abstractions: Entity integration An integration between CSF.ORM and CSF.Entities, providing convenience functionality for projects which use both. - 2.0.1 + 2.0.2 $(ReleaseVersion) $(ReleaseVersion) MIT diff --git a/CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj b/CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj index e8a6823..0374d63 100644 --- a/CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj +++ b/CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj @@ -9,7 +9,7 @@ false - 2.0.1 + 2.0.2 $(ReleaseVersion) true ..\CSF-Software-OSS.snk diff --git a/CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj b/CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj index ce3f9b9..a9b70b0 100644 --- a/CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj +++ b/CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj @@ -12,7 +12,7 @@ craigfowler ORM abstractions: Implementation for NHibernate 4 Implementation of the ORM abstractions for users of NHibernate version 4.x. - 2.0.1 + 2.0.2 $(ReleaseVersion) $(ReleaseVersion) MIT diff --git a/CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj b/CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj index 3007127..cba0072 100644 --- a/CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj +++ b/CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj @@ -12,7 +12,7 @@ craigfowler ORM abstractions: Implementation for NHibernate 5 Implementation of the ORM abstractions for users of NHibernate version 5.x. - 2.0.1 + 2.0.2 $(ReleaseVersion) $(ReleaseVersion) MIT diff --git a/CSF.ORM.sln b/CSF.ORM.sln index 1a82740..76a7d3a 100644 --- a/CSF.ORM.sln +++ b/CSF.ORM.sln @@ -171,6 +171,6 @@ Global $0.NameConventionPolicy = $4 $4.Rules = $5 $5.NamingRule = $25 - version = 2.0.1 + version = 2.0.2 EndGlobalSection EndGlobal diff --git a/CSF.ORM/CSF.ORM.csproj b/CSF.ORM/CSF.ORM.csproj index 8855f27..d092898 100644 --- a/CSF.ORM/CSF.ORM.csproj +++ b/CSF.ORM/CSF.ORM.csproj @@ -12,7 +12,7 @@ craigfowler ORM abstractions Types which relate to the usage of an ORM, so that a business logic project does not need to depend upon the ORM directly. - 2.0.1 + 2.0.2 $(ReleaseVersion) $(ReleaseVersion) MIT diff --git a/PersistenceTester/CSF.PersistenceTester.Core/CSF.PersistenceTester.Core.csproj b/PersistenceTester/CSF.PersistenceTester.Core/CSF.PersistenceTester.Core.csproj index 1cd7902..30ebbb7 100644 --- a/PersistenceTester/CSF.PersistenceTester.Core/CSF.PersistenceTester.Core.csproj +++ b/PersistenceTester/CSF.PersistenceTester.Core/CSF.PersistenceTester.Core.csproj @@ -18,7 +18,7 @@ CSF.PersistenceTester ORM persistence tester A utility for testing object/entity persistence when using an ORM. - 2.0.1 + 2.0.2 $(ReleaseVersion) $(ReleaseVersion) false diff --git a/PersistenceTester/CSF.PersistenceTester.NUnit/CSF.PersistenceTester.NUnit.csproj b/PersistenceTester/CSF.PersistenceTester.NUnit/CSF.PersistenceTester.NUnit.csproj index 19ca8ea..82ea86c 100644 --- a/PersistenceTester/CSF.PersistenceTester.NUnit/CSF.PersistenceTester.NUnit.csproj +++ b/PersistenceTester/CSF.PersistenceTester.NUnit/CSF.PersistenceTester.NUnit.csproj @@ -18,7 +18,7 @@ CSF.PersistenceTester.NUnit ORM persistence tester: NUnit integration An integration for the ORM persistence tester and NUnit 3.x. Provides an NUnit constraint for asserting that the test passed. - 2.0.1 + 2.0.2 $(ReleaseVersion) $(ReleaseVersion) false diff --git a/Tests/CSF.CommonTestLogic/CSF.CommonTestLogic.csproj b/Tests/CSF.CommonTestLogic/CSF.CommonTestLogic.csproj index f51d62b..331186b 100644 --- a/Tests/CSF.CommonTestLogic/CSF.CommonTestLogic.csproj +++ b/Tests/CSF.CommonTestLogic/CSF.CommonTestLogic.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 2.0.1 + 2.0.2 CSF false diff --git a/Tests/CSF.Entities.Tests/CSF.Entities.Tests.csproj b/Tests/CSF.Entities.Tests/CSF.Entities.Tests.csproj index b7d0c9d..6f67bca 100644 --- a/Tests/CSF.Entities.Tests/CSF.Entities.Tests.csproj +++ b/Tests/CSF.Entities.Tests/CSF.Entities.Tests.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 2.0.1 + 2.0.2 diff --git a/Tests/CSF.ORM.NHibernate4.Tests/CSF.ORM.NHibernate4.Tests.csproj b/Tests/CSF.ORM.NHibernate4.Tests/CSF.ORM.NHibernate4.Tests.csproj index 7f64c8a..7b8a5a1 100644 --- a/Tests/CSF.ORM.NHibernate4.Tests/CSF.ORM.NHibernate4.Tests.csproj +++ b/Tests/CSF.ORM.NHibernate4.Tests/CSF.ORM.NHibernate4.Tests.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 2.0.1 + 2.0.2 diff --git a/Tests/CSF.ORM.NHibernate5.Tests/CSF.ORM.NHibernate5.Tests.csproj b/Tests/CSF.ORM.NHibernate5.Tests/CSF.ORM.NHibernate5.Tests.csproj index afb3e27..f4ee2ef 100644 --- a/Tests/CSF.ORM.NHibernate5.Tests/CSF.ORM.NHibernate5.Tests.csproj +++ b/Tests/CSF.ORM.NHibernate5.Tests/CSF.ORM.NHibernate5.Tests.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 2.0.1 + 2.0.2 diff --git a/Tests/CSF.ORM.Tests/CSF.ORM.Tests.csproj b/Tests/CSF.ORM.Tests/CSF.ORM.Tests.csproj index 3037208..00cc341 100644 --- a/Tests/CSF.ORM.Tests/CSF.ORM.Tests.csproj +++ b/Tests/CSF.ORM.Tests/CSF.ORM.Tests.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 2.0.1 + 2.0.2 diff --git a/Tests/CSF.PersistenceTester.IntegrationTests/CSF.PersistenceTester.IntegrationTests.csproj b/Tests/CSF.PersistenceTester.IntegrationTests/CSF.PersistenceTester.IntegrationTests.csproj index 58260b1..9374b33 100644 --- a/Tests/CSF.PersistenceTester.IntegrationTests/CSF.PersistenceTester.IntegrationTests.csproj +++ b/Tests/CSF.PersistenceTester.IntegrationTests/CSF.PersistenceTester.IntegrationTests.csproj @@ -3,7 +3,7 @@ netcoreapp2.2 Library - 2.0.1 + 2.0.2 diff --git a/Tests/CSF.PersistenceTester.Tests/CSF.PersistenceTester.Tests.csproj b/Tests/CSF.PersistenceTester.Tests/CSF.PersistenceTester.Tests.csproj index 2863d25..0cdd9b8 100644 --- a/Tests/CSF.PersistenceTester.Tests/CSF.PersistenceTester.Tests.csproj +++ b/Tests/CSF.PersistenceTester.Tests/CSF.PersistenceTester.Tests.csproj @@ -3,7 +3,7 @@ netcoreapp2.2 Library - 2.0.1 + 2.0.2