From 2dc5cb5d00d734c7634da814e88d521a2db88973 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 6 Apr 2022 16:52:32 -0400 Subject: [PATCH 1/2] Fixes #2181 wrong test cases --- .../RenameBuildingBlockTaskSpecs.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/PKSim.Tests/IntegrationTests/RenameBuildingBlockTaskSpecs.cs b/tests/PKSim.Tests/IntegrationTests/RenameBuildingBlockTaskSpecs.cs index bf3e88453..34f849e08 100644 --- a/tests/PKSim.Tests/IntegrationTests/RenameBuildingBlockTaskSpecs.cs +++ b/tests/PKSim.Tests/IntegrationTests/RenameBuildingBlockTaskSpecs.cs @@ -47,9 +47,8 @@ public override void GlobalContext() LoadProject("BuildingBlockRename_611"); _formulation = FindByName("Weibull"); _oldName = _formulation.Name; - _formulation.Name = "NEW F"; _simulation = FindByName("S3"); - sut.RenameBuildingBlock(_formulation, _oldName); + sut.RenameBuildingBlock(_formulation, "NEW F"); } [Observation] @@ -91,11 +90,8 @@ public override void GlobalContext() _s2 = FindByName("S2"); _s3 = FindByName("S3"); - _iv.Name = "NEW_IV"; - sut.RenameBuildingBlock(_iv, "IV"); - - _oral.Name = "NEW_ORAL"; - sut.RenameBuildingBlock(_oral, "ORAL"); + sut.RenameBuildingBlock(_iv, "NEW_IV"); + sut.RenameBuildingBlock(_oral, "NEW_ORAL"); } [Observation] @@ -127,8 +123,7 @@ public override void GlobalContext() _iv = FindByName("aa"); _s1 = FindByName("aa"); - _iv.Name = "bb"; - sut.RenameBuildingBlock(_iv, "IV"); + sut.RenameBuildingBlock(_iv, "bb"); } [Observation] From abfff7baeb73f4885d3e84965ed149dc24b77165 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 6 Apr 2022 17:46:38 -0400 Subject: [PATCH 2/2] Fixes #2181 project conversion issue --- .../PKSim.Assets.Images.csproj | 4 ++-- src/PKSim.Assets/PKSim.Assets.csproj | 4 ++-- src/PKSim.BatchTool/PKSim.BatchTool.csproj | 2 +- src/PKSim.CLI.Core/PKSim.CLI.Core.csproj | 2 +- src/PKSim.CLI/PKSim.CLI.csproj | 4 ++-- src/PKSim.Core/PKSim.Core.csproj | 8 ++++---- src/PKSim.Infrastructure/ORM/DAS/DAS.cs | 2 +- .../PKSim.Infrastructure.csproj | 16 ++++++++-------- .../Services/GeneExpressionQueries.cs | 2 +- src/PKSim.Matlab/PKSim.Matlab.csproj | 2 +- src/PKSim.Presentation/PKSim.Presentation.csproj | 4 ++-- src/PKSim.R/PKSim.R.csproj | 2 +- src/PKSim.UI/PKSim.UI.csproj | 6 +++--- src/PKSim/PKSim.csproj | 4 ++-- .../PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj | 2 +- tests/PKSim.R.Tests/PKSim.R.Tests.csproj | 2 +- tests/PKSim.Tests/PKSim.Tests.csproj | 2 +- tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj | 4 ++-- tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj b/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj index 0992aead5..191f0b794 100644 --- a/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj +++ b/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/src/PKSim.Assets/PKSim.Assets.csproj b/src/PKSim.Assets/PKSim.Assets.csproj index 769a6a4b5..14ee1398e 100644 --- a/src/PKSim.Assets/PKSim.Assets.csproj +++ b/src/PKSim.Assets/PKSim.Assets.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/src/PKSim.BatchTool/PKSim.BatchTool.csproj b/src/PKSim.BatchTool/PKSim.BatchTool.csproj index b685a1033..422bd1a8b 100644 --- a/src/PKSim.BatchTool/PKSim.BatchTool.csproj +++ b/src/PKSim.BatchTool/PKSim.BatchTool.csproj @@ -63,7 +63,7 @@ - + diff --git a/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj b/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj index 2dfd426fc..267e27817 100644 --- a/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj +++ b/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/PKSim.CLI/PKSim.CLI.csproj b/src/PKSim.CLI/PKSim.CLI.csproj index 0c5582674..7a68a63f6 100644 --- a/src/PKSim.CLI/PKSim.CLI.csproj +++ b/src/PKSim.CLI/PKSim.CLI.csproj @@ -61,8 +61,8 @@ - - + + diff --git a/src/PKSim.Core/PKSim.Core.csproj b/src/PKSim.Core/PKSim.Core.csproj index 7005d2597..7f38b4146 100644 --- a/src/PKSim.Core/PKSim.Core.csproj +++ b/src/PKSim.Core/PKSim.Core.csproj @@ -30,10 +30,10 @@ - - - - + + + + diff --git a/src/PKSim.Infrastructure/ORM/DAS/DAS.cs b/src/PKSim.Infrastructure/ORM/DAS/DAS.cs index 2cf4ffd77..f0350b092 100644 --- a/src/PKSim.Infrastructure/ORM/DAS/DAS.cs +++ b/src/PKSim.Infrastructure/ORM/DAS/DAS.cs @@ -232,7 +232,7 @@ public string DatabaseName get { if (IsConnected) - return String.IsNullOrEmpty(Connection.Database) + return string.IsNullOrEmpty(Connection.Database) ? Connection.DataSource : Connection.Database; throw new NotConnectedException(); diff --git a/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj b/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj index 768423142..ffa5e5de6 100644 --- a/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj +++ b/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj @@ -41,14 +41,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/PKSim.Infrastructure/Services/GeneExpressionQueries.cs b/src/PKSim.Infrastructure/Services/GeneExpressionQueries.cs index 00e8d823f..a05a68948 100644 --- a/src/PKSim.Infrastructure/Services/GeneExpressionQueries.cs +++ b/src/PKSim.Infrastructure/Services/GeneExpressionQueries.cs @@ -317,7 +317,7 @@ private void validateQuery(string columns, string query) /// /// This method validates the schema of the database. /// - /// Thrown when an error occured. + /// Thrown when an error occurred. public void ValidateDatabase() { try diff --git a/src/PKSim.Matlab/PKSim.Matlab.csproj b/src/PKSim.Matlab/PKSim.Matlab.csproj index 8e8b78d02..8dd03c4c7 100644 --- a/src/PKSim.Matlab/PKSim.Matlab.csproj +++ b/src/PKSim.Matlab/PKSim.Matlab.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/PKSim.Presentation/PKSim.Presentation.csproj b/src/PKSim.Presentation/PKSim.Presentation.csproj index 1890ebe7a..3c368ddca 100644 --- a/src/PKSim.Presentation/PKSim.Presentation.csproj +++ b/src/PKSim.Presentation/PKSim.Presentation.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/PKSim.R/PKSim.R.csproj b/src/PKSim.R/PKSim.R.csproj index 8c3676d7b..6958dedc7 100644 --- a/src/PKSim.R/PKSim.R.csproj +++ b/src/PKSim.R/PKSim.R.csproj @@ -50,7 +50,7 @@ - + diff --git a/src/PKSim.UI/PKSim.UI.csproj b/src/PKSim.UI/PKSim.UI.csproj index ac41fceec..eac06f675 100644 --- a/src/PKSim.UI/PKSim.UI.csproj +++ b/src/PKSim.UI/PKSim.UI.csproj @@ -51,9 +51,9 @@ - - - + + + diff --git a/src/PKSim/PKSim.csproj b/src/PKSim/PKSim.csproj index 7f0a64625..b8711c623 100644 --- a/src/PKSim/PKSim.csproj +++ b/src/PKSim/PKSim.csproj @@ -76,13 +76,13 @@ - + - + diff --git a/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj b/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj index 43800794a..18a80e10b 100644 --- a/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj +++ b/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj @@ -23,7 +23,7 @@ - + diff --git a/tests/PKSim.R.Tests/PKSim.R.Tests.csproj b/tests/PKSim.R.Tests/PKSim.R.Tests.csproj index 860d61655..075b0a1f6 100644 --- a/tests/PKSim.R.Tests/PKSim.R.Tests.csproj +++ b/tests/PKSim.R.Tests/PKSim.R.Tests.csproj @@ -23,7 +23,7 @@ - + diff --git a/tests/PKSim.Tests/PKSim.Tests.csproj b/tests/PKSim.Tests/PKSim.Tests.csproj index dd2aacb29..6b3728787 100644 --- a/tests/PKSim.Tests/PKSim.Tests.csproj +++ b/tests/PKSim.Tests/PKSim.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj b/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj index e6cb98e23..e73715881 100644 --- a/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj +++ b/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj @@ -56,13 +56,13 @@ - + - + diff --git a/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj b/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj index a971fb46b..1d2fb96c3 100644 --- a/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj +++ b/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj @@ -18,8 +18,8 @@ - - + +