From c4752686f4b2863166435e1ad81d7dba410f9352 Mon Sep 17 00:00:00 2001 From: SamRobinson75684 <166817125+SamRobinson75684@users.noreply.github.com> Date: Mon, 6 Jan 2025 14:55:21 +0000 Subject: [PATCH] fix: adding all unit tests to unit tests folder and making sure tests are being run (#539) * fix: adding all unit tests to unit tests folder and making sure test files for receiveCassFileTests are not ingored * fix: fixing unit tess * fix: fixing unit tess * fix: fixing unit tess * fix: fixing unit tess * fix: fixing unit tess --- .gitignore | 1 + .../CohortManager/src/Functions/Functions.sln | 24 ++++++++++++------ .../AddBatchToQueueTest.cs | 0 .../AddBatchToQueueTest.csproj | 3 ++- .../RecordsProcessedTrackerTests.cs | 5 ---- .../RecordsProcessedTrackerTests.csproj | 4 +-- .../ValidateDates/ValidateDatesTests.cs | 16 ++++-------- .../ValidateDates/ValidateDatesTests.csproj | 5 ++-- .../ProcessCaasFileTests.csproj | 2 +- .../processCaasFileTests.cs | 1 - .../BSS_20240718150245_n4.parquet | Bin .../F9B292BSS_20241201121212_n1.parquet | Bin 0 -> 11701 bytes .../ReceiveCaasFileTests.cs | 0 ...d_1_-_CAAS_BREAST_SCREENING_COHORT.parquet | Bin 0 -> 12148 bytes .../receiveCaasFileTest.csproj | 4 +-- .../MeshResponseTestHelper.cs | 0 .../RetrieveMeshFileTest.cs | 0 .../retrieveMeshFileTest.csproj | 2 +- .../BsSelectGpPracticeDataServiceTests.cs | 0 .../BsSelectOutCodeDataServiceTests.cs | 0 .../CurrentPostingDataServiceTests.cs | 0 .../DataServiceClientTests.cs | 0 .../DataServiceTests/DataServiceTestHelper.cs | 0 .../DataServiceTests/DataServiceTests.csproj | 10 ++++---- .../MockDataServiceAccessor.cs | 0 25 files changed, 37 insertions(+), 40 deletions(-) rename tests/{ => UnitTests}/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs (100%) rename tests/{ => UnitTests}/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj (77%) rename tests/{ => UnitTests}/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs (91%) rename tests/{ => UnitTests}/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj (76%) rename tests/{ => UnitTests}/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs (93%) rename tests/{ => UnitTests}/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj (76%) rename tests/{ => UnitTests}/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj (84%) rename tests/{ => UnitTests}/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs (99%) rename tests/{ => UnitTests}/CaasIntegrationTests/receiveCaasFileTest/BSS_20240718150245_n4.parquet (100%) create mode 100644 tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/F9B292BSS_20241201121212_n1.parquet rename tests/{ => UnitTests}/CaasIntegrationTests/receiveCaasFileTest/ReceiveCaasFileTests.cs (100%) create mode 100644 tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/add_1_-_CAAS_BREAST_SCREENING_COHORT.parquet rename tests/{ => UnitTests}/CaasIntegrationTests/receiveCaasFileTest/receiveCaasFileTest.csproj (84%) rename tests/{ => UnitTests}/CaasIntegrationTests/retrieveMeshFileTest/MeshResponseTestHelper.cs (100%) rename tests/{ => UnitTests}/CaasIntegrationTests/retrieveMeshFileTest/RetrieveMeshFileTest.cs (100%) rename tests/{ => UnitTests}/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj (84%) rename tests/{ => UnitTests}/DataServiceTests/BsSelectGpPracticeDataServiceTests.cs (100%) rename tests/{ => UnitTests}/DataServiceTests/BsSelectOutCodeDataServiceTests.cs (100%) rename tests/{ => UnitTests}/DataServiceTests/CurrentPostingDataServiceTests.cs (100%) rename tests/{ => UnitTests}/DataServiceTests/DataServiceClientTests.cs (100%) rename tests/{ => UnitTests}/DataServiceTests/DataServiceTestHelper.cs (100%) rename tests/{ => UnitTests}/DataServiceTests/DataServiceTests.csproj (60%) rename tests/{ => UnitTests}/DataServiceTests/MockDataServiceAccessor.cs (100%) diff --git a/.gitignore b/.gitignore index 44d5f50ae..1f092d2c1 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ local.settings.json application/CohortManager/SampleData/ *.csv *.parquet +!tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/*.parquet # csv to sql statement scripts bs_select_gp_practice_lpk.txt diff --git a/application/CohortManager/src/Functions/Functions.sln b/application/CohortManager/src/Functions/Functions.sln index 9e3daf6d8..45c12352e 100644 --- a/application/CohortManager/src/Functions/Functions.sln +++ b/application/CohortManager/src/Functions/Functions.sln @@ -28,7 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Shared\Common\Com EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Shared\Model\Model.csproj", "{682DDE9F-2868-4477-B159-9EB7D255D565}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "receiveCaasFileTest", "..\..\..\..\tests\CaasIntegrationTests\receiveCaasFileTest\receiveCaasFileTest.csproj", "{8DF1A047-4800-4668-877F-8AC8708AB238}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "receiveCaasFileTest", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\receiveCaasFileTest\receiveCaasFileTest.csproj", "{8DF1A047-4800-4668-877F-8AC8708AB238}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Shared\Data\Data.csproj", "{ABA8CD5A-BEF7-4962-9C23-AE69F430CC1B}" EndProject @@ -106,7 +106,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateParticipantTests", ". EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RetrieveMeshFile", "CaasIntegration\RetrieveMeshFile\RetrieveMeshFile.csproj", "{A5CC3CCE-2816-434A-AC32-FCF4251BDCAC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "retrieveMeshFileTest", "..\..\..\..\tests\CaasIntegrationTests\retrieveMeshFileTest\retrieveMeshFileTest.csproj", "{31A651CD-25D0-4131-B773-0A34495164D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "retrieveMeshFileTest", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\retrieveMeshFileTest\retrieveMeshFileTest.csproj", "{31A651CD-25D0-4131-B773-0A34495164D5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidateCohortDistributionRecord", "CohortDistributionServices\ValidateCohortDistributionRecord\ValidateCohortDistributionRecord.csproj", "{BD5E5333-2C20-4009-BF58-BFB930AD6B6C}" EndProject @@ -154,8 +154,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageCodesDataService", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurrentPosting", "screeningDataServices\CurrentPostingDataService\CurrentPosting.csproj", "{9974CB33-DDF0-4CBD-95F8-6CA94F2F04E8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataServiceTests", "..\..\..\..\tests\DataServiceTests\DataServiceTests.csproj", "{824D0893-14F9-47D9-B381-3BB899B4CBDA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExcludedSMULookupDataServices", "screeningDataServices\ExcludedSMULookupDataService\ExcludedSMULookupDataServices.csproj", "{9B9E8E86-601F-4C10-B6EF-348AF9A168AA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParticipantDemographicDataService", "screeningDataServices\ParticipantDemographicDataService\ParticipantDemographicDataService.csproj", "{D8990183-52BA-4A1F-B333-5B32AAF14348}" @@ -166,13 +164,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TransformReasonForRemovalTe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TransformDataServiceTests", "..\..\..\..\tests\UnitTests\TransformDataServiceTests\TransformDataServiceTests\TransformDataServiceTests.csproj", "{DCBF3583-DC87-46BE-93DC-C345E779D95C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessCaasFileTests", "..\..\..\..\tests\CaasIntegrationTests\processCaasFileTest\ProcessCaasFileTests.csproj", "{FE9773EF-DFB8-4308-869B-EABD0776C828}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessCaasFileTests", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\processCaasFileTest\ProcessCaasFileTests.csproj", "{FE9773EF-DFB8-4308-869B-EABD0776C828}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddBatchToQueueTest", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\AddBatchToQueueTest\AddBatchToQueueTest.csproj", "{2AC4643E-35A5-4BC1-BDF9-2377E9748316}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddBatchToQueueTest", "..\..\..\..\tests\CaasIntegrationTests\AddBatchToQueueTest\AddBatchToQueueTest.csproj", "{2AC4643E-35A5-4BC1-BDF9-2377E9748316}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordsProcessedTrackerTests", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\RecordsProcessedTrackerTests\RecordsProcessedTrackerTests.csproj", "{AA6F6E1A-7511-4A65-ADCB-B86DF46223D6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordsProcessedTrackerTests", "..\..\..\..\tests\CaasIntegrationTests\RecordsProcessedTrackerTests\RecordsProcessedTrackerTests.csproj", "{AA6F6E1A-7511-4A65-ADCB-B86DF46223D6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidateDatesTests", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\ValidateDates\ValidateDatesTests.csproj", "{9005A919-F64D-4723-87A7-595BB4E64563}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidateDatesTests", "..\..\..\..\tests\CaasIntegrationTests\ValidateDates\ValidateDatesTests.csproj", "{FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataServiceTests", "..\..\..\..\tests\UnitTests\DataServiceTests\DataServiceTests.csproj", "{E26B2D73-BD60-4AD8-B403-939ACEDE9429}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -432,6 +432,14 @@ Global {FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}.Debug|Any CPU.Build.0 = Debug|Any CPU {FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}.Release|Any CPU.ActiveCfg = Release|Any CPU {FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}.Release|Any CPU.Build.0 = Release|Any CPU + {9005A919-F64D-4723-87A7-595BB4E64563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9005A919-F64D-4723-87A7-595BB4E64563}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9005A919-F64D-4723-87A7-595BB4E64563}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9005A919-F64D-4723-87A7-595BB4E64563}.Release|Any CPU.Build.0 = Release|Any CPU + {E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs b/tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs similarity index 100% rename from tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs rename to tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs diff --git a/tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj b/tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj similarity index 77% rename from tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj rename to tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj index 934974c63..e9105b0c3 100644 --- a/tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj +++ b/tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj @@ -23,6 +23,7 @@ - + + diff --git a/tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs b/tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs similarity index 91% rename from tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs rename to tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs index db8abfa73..b2c766cb0 100644 --- a/tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs +++ b/tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs @@ -1,11 +1,6 @@ namespace NHS.CohortManager.Tests.CaasIntegrationTests; -using Azure.Storage.Queues; -using Microsoft.Extensions.Logging; -using Model; -using Moq; using NHS.Screening.ReceiveCaasFile; -using receiveCaasFile; [TestClass] public class RecordsProcessedTrackerTests diff --git a/tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj b/tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj similarity index 76% rename from tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj rename to tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj index 534b73ccf..98fe3a5cb 100644 --- a/tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj +++ b/tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj @@ -22,8 +22,8 @@ - + + diff --git a/tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs b/tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs similarity index 93% rename from tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs rename to tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs index 6bb64be9a..9227cdac7 100644 --- a/tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs +++ b/tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs @@ -1,16 +1,10 @@ namespace NHS.CohortManager.Tests.CaasIntegrationTests; -using System.Diagnostics; using System.Reflection; -using System.Runtime.CompilerServices; -using System.Text.Json; -using Common; -using Common.Interfaces; using Microsoft.Extensions.Logging; using Model; using Moq; using NHS.Screening.ReceiveCaasFile; -using receiveCaasFile; [TestClass] public class ValidateDatesTests @@ -39,7 +33,7 @@ public void ValidateDates_ShouldReturnFalse_WhenCurrentPostingEffectiveFromDateI PrimaryCareProviderEffectiveFromDate = "20230101" }; - var res = _validateDates.ValidateAlleDates(participant); + var res = _validateDates.ValidateAllDates(participant); // Assert Assert.IsFalse(res); @@ -60,7 +54,7 @@ public void ValidateDates_ShouldReturnTrue_WhenAllDatesAreValid() PrimaryCareProviderEffectiveFromDate = "20230101" }; - var res = _validateDates.ValidateAlleDates(participant); + var res = _validateDates.ValidateAllDates(participant); // Assert Assert.IsTrue(res); @@ -89,7 +83,7 @@ public void ValidateDates_ShouldReturnFalse_WhenEmailAddressEffectiveFromDateIsI PrimaryCareProviderEffectiveFromDate = "20230101" }; - var res = _validateDates.ValidateAlleDates(participant); + var res = _validateDates.ValidateAllDates(participant); // Assert Assert.IsFalse(res); @@ -117,7 +111,7 @@ public void ValidateDates_ShouldReturnFalse_WhenMobileNumberEffectiveFromDateIsI PrimaryCareProviderEffectiveFromDate = "20230101" }; - var res = _validateDates.ValidateAlleDates(participant); + var res = _validateDates.ValidateAllDates(participant); // Assert Assert.IsFalse(res); _loggerMock.Verify(x => x.Log(It.Is(l => l == LogLevel.Error), @@ -143,7 +137,7 @@ public void ValidateDates_ShouldReturnFalse_WhenUsualAddressEffectiveFromDateIsI PrimaryCareProviderEffectiveFromDate = "20230101" }; - var res = _validateDates.ValidateAlleDates(participant); + var res = _validateDates.ValidateAllDates(participant); // Assert Assert.IsFalse(res); diff --git a/tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj b/tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj similarity index 76% rename from tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj rename to tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj index 388fb79c6..f1d946d9d 100644 --- a/tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj +++ b/tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj @@ -22,9 +22,8 @@ - - + + diff --git a/tests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj b/tests/UnitTests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj similarity index 84% rename from tests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj rename to tests/UnitTests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj index 388fb79c6..7ceb191f3 100644 --- a/tests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj +++ b/tests/UnitTests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj @@ -23,7 +23,7 @@ + Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" /> diff --git a/tests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs b/tests/UnitTests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs similarity index 99% rename from tests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs rename to tests/UnitTests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs index 7af70308f..30ac57d4c 100644 --- a/tests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs +++ b/tests/UnitTests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs @@ -10,7 +10,6 @@ namespace NHS.CohortManager.Tests.CaasIntegrationTests; using Model; using Moq; using NHS.Screening.ReceiveCaasFile; -using receiveCaasFile; [TestClass] public class ProcessCaasFileTests diff --git a/tests/CaasIntegrationTests/receiveCaasFileTest/BSS_20240718150245_n4.parquet b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/BSS_20240718150245_n4.parquet similarity index 100% rename from tests/CaasIntegrationTests/receiveCaasFileTest/BSS_20240718150245_n4.parquet rename to tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/BSS_20240718150245_n4.parquet diff --git a/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/F9B292BSS_20241201121212_n1.parquet b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/F9B292BSS_20241201121212_n1.parquet new file mode 100644 index 0000000000000000000000000000000000000000..980d8cb927d8a0c29cfa1ebcee2ad48bcb38ab1d GIT binary patch literal 11701 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 J8veuf{{UAitvvt$ literal 0 HcmV?d00001 diff --git a/tests/CaasIntegrationTests/receiveCaasFileTest/ReceiveCaasFileTests.cs b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/ReceiveCaasFileTests.cs similarity index 100% rename from tests/CaasIntegrationTests/receiveCaasFileTest/ReceiveCaasFileTests.cs rename to tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/ReceiveCaasFileTests.cs diff --git a/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/add_1_-_CAAS_BREAST_SCREENING_COHORT.parquet b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/add_1_-_CAAS_BREAST_SCREENING_COHORT.parquet new file mode 100644 index 0000000000000000000000000000000000000000..e029fa09efdc64c766782f2a02239fae6252521c GIT binary patch literal 12148 zcmcgy4RBP|6~5VoO-MpWLhfT1maqh}7{s`n>?R>@tx%vqDMi7SsXyy(_HDA`W_NwN zNr_H7N@*Iv$ZEO;q?@yfyTMS5BXUVZARImh2bsCek+?In_8Gk)Qd=U&Ry zQ}jQI(4q2rB$OV?vq9vT2M5!PgEq) z|NN7&6M7~>^w;$Eq6@#i!!Aaj*qJrmz@;}181?KlCI*+CK;iM-`SM`jfj``Kx=c?g zCsEnIY$ba8SLZH@(XYbG@s8oEALi((at{YtTp z=2%{$^6K72TRt^!=|V@Mjk~4^x+I{#ee}JjC+X-yKv!N}iS9ev{+#IHJiG$`;jz(U zdW&ETCAxP6jK=QnZglA77auJb2rc;9C$tl9z}t`R94*l?vH~TR_gySJHfhU~pPH)+ z7hl~{gXaEhVEqh%_9na^ic?o3S+&CsqfCaFeUpe*nLESMlCXC&I?j5kX)qK>s5i5iD(L2L0 z>g}p90?UmMNT!=XhwH4JVi*_TCHVRAKONQEL&kvgA_F`BSNl&_QGsw&s%r;~Y`U=o(w?EScku{s-qJ~rsV38k?l8PEqY-i75 zQA#SNNadJKfPqLW|7$adHX47}RM+6Ln@wUNMGw3%*4Z8PcBfoWOXMzDycqn1r@C(f z+CS!Epbby8cHRn>^O;TjA9Zj35|#^lIltK?mDDnmS428O-qtp6*lbeDYPnor1c=B} z-B;jP)L^$e91a)-si+|(4Uq0wmDaf$t?Q!RU~604dRN2?#;cmt*oDiyvA8eN!G&3~ ziK?h2rBP0vZG}H*V?*t+K!gN~s;Ko#?hXgztl#>hV7S#EX*Ziv8q^vEizsGGHY@@usi+}UXSdfwpox@JR7+|5n0cmY>*bMggE>b2sJV*ljt0jf z;m2&EYie0A8H{dnH1XC8MYU9sy|GF9A&5#%ElUucc9)&ZJgKOb()R0GT5~`+N5lKH z?XaKZGaeP_z>CPC3cM2E|1f>YDz+F%7;JA`S_T@3B) zxsp^?NOnEJjv9QQ;cu{dms zG|=3XK2HX$qOcd-j&f`uxRJ&wYz6wThxF3TrIC0W%Xzdrivr&EUeM?#X^RhPc2K7E%n zeV2>wDj;ERiTINOlOOd4JP)#6wBSt1-V9?<&avKDBv1tpcQY13?Grc|H3x@O|=c!~e zfKGv>91MBHkkZ!8N$SZInsPGNSy(@QPYBk1hqqN8M+EVi9*lW{;W*2I7(8J-9_k2! zFyzrl^nzg+oS@$mfCHS+RK$jYtwHcN81F)GlC_w>vDqLsQEYY@VcSpIc5ohJU{)|8 zTY;NDiSrKz-9%31d>QsL$k)MJ54jnmbT~)MXHGnW>7Ij|kS%V(c_OlUHRA=f04r@o(fE;8*m z8)4qVos53~i(IDhsd=Ah0Q`}8WZsWc_!D`@$^MN4XNory_HTgj_f`}CM)MW_=y#^< z+h{)c1~*3jL41?SX?*(&!5*$Az70{^1@+#Qp@(3*;P0El6Tqn&4PT(li;Dz)s|~x6 z?Z{-sbk+NtCt1tHLCP)PS>*yyN%vT}jV3Hn2sbqX;Yk}_foubiJd)-DeJ0?!)-xMH zz)jtJsUq+xH)5)t<}6n@pCz2V^YL0_>x1;D#Ho4SkfYgG1Oo+^YW_h6N-EPN)FeDY zNY2kE1C@XTu0$fgV)-)*kA4@^2_mp9NjGw(1Uwq8G-Ija)(BzT0ZC(I>wyH4v@wZi zA)aa#(*}LlyWL)HgzajSCn8@%B-fG;Qx2Zc$8_h|#(`0l8c?@@vlEb_owq8^_cY;3 zW}pU#knIX&wzO@k<8AsW^DxM`>Ffht1~aI<1l>bZS18ndO%V583-Ef_ZXg4#OevbFBXs&!boX4NT=-0NGW)uBu3~m@kYCcrl!0(&wFz- z@#YMC4bt|;#Z%wUY{~&4cWP!OwGK9<6Y81omU!UjT;3|OQ!81oO#;*o4~$W zOQ!8EMuDB+O@yZ+2b*0?_V3=FW-wv2mb`l(pRSl7Z@c_GMt17)>6x8+o*?$!N}Re3 zhz9W(opd9T0WSj}pMMjcFep@w8Vu#g{AM$3ro*?AH||-JVzBn@is#t?uidjIcTx&3 zsRFEYdM~MuvVmcgl{P}0?6u4BMQPK97_H%sltaNO&@Is6^`E9z>b3s5{`p26+0$$ z`;-H6aHbFtKJBSwJ;i{ew9PbB>7g$GmaV@61ee>9E#&0`U z>4vN@{6g^gzf`!DrMSxtOYvMiw!^MGTR~5{y~~h;vnK+1fIx0_639JP1(Lq~%ZPid zfS3cn#7Od2)5wzq@d!a=4lsJ&#CTRL&Fn1^s)f!X2RyRAX@tvWHdoEv)jh z0dGerUe!!`ez{OqSEWYPAfbppgjN>y+EJ8@>b2{p%gtUpQc{vuO5>_wGRHLuNF(u; z4Q5K>_Xa>{rP8v2rBck1xePYgo!- z3wd|7e&z|Egiv?g2=&*E;Jj`GS2hUJr-Q6?g)a=*s7m3#L0gUbgG4q)sZnm!h9fN$ z{*I81Y4k@DwLW|w(0gg7d@K<@r>IdfFPapf8#H*T4=>ppsDipdCMJE*$tH4105@t@ zsXrWLV_KT;OKK=zBobo1VZE6~e~rotfckcI4f^-}5}C?=!NEV}aJB959W+!+-teY8 za$H5GRpROOmUhnC2_MCSk+9WK>u}cATW|7p1VetS&&Ad^HhAk=ye!+;(CBqI*hZJH nv8mqWsPj3TErF&M?;< - + Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" /> + diff --git a/tests/CaasIntegrationTests/retrieveMeshFileTest/MeshResponseTestHelper.cs b/tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/MeshResponseTestHelper.cs similarity index 100% rename from tests/CaasIntegrationTests/retrieveMeshFileTest/MeshResponseTestHelper.cs rename to tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/MeshResponseTestHelper.cs diff --git a/tests/CaasIntegrationTests/retrieveMeshFileTest/RetrieveMeshFileTest.cs b/tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/RetrieveMeshFileTest.cs similarity index 100% rename from tests/CaasIntegrationTests/retrieveMeshFileTest/RetrieveMeshFileTest.cs rename to tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/RetrieveMeshFileTest.cs diff --git a/tests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj b/tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj similarity index 84% rename from tests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj rename to tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj index 085031531..6610e0169 100644 --- a/tests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj +++ b/tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj @@ -22,7 +22,7 @@ - + diff --git a/tests/DataServiceTests/BsSelectGpPracticeDataServiceTests.cs b/tests/UnitTests/DataServiceTests/BsSelectGpPracticeDataServiceTests.cs similarity index 100% rename from tests/DataServiceTests/BsSelectGpPracticeDataServiceTests.cs rename to tests/UnitTests/DataServiceTests/BsSelectGpPracticeDataServiceTests.cs diff --git a/tests/DataServiceTests/BsSelectOutCodeDataServiceTests.cs b/tests/UnitTests/DataServiceTests/BsSelectOutCodeDataServiceTests.cs similarity index 100% rename from tests/DataServiceTests/BsSelectOutCodeDataServiceTests.cs rename to tests/UnitTests/DataServiceTests/BsSelectOutCodeDataServiceTests.cs diff --git a/tests/DataServiceTests/CurrentPostingDataServiceTests.cs b/tests/UnitTests/DataServiceTests/CurrentPostingDataServiceTests.cs similarity index 100% rename from tests/DataServiceTests/CurrentPostingDataServiceTests.cs rename to tests/UnitTests/DataServiceTests/CurrentPostingDataServiceTests.cs diff --git a/tests/DataServiceTests/DataServiceClientTests.cs b/tests/UnitTests/DataServiceTests/DataServiceClientTests.cs similarity index 100% rename from tests/DataServiceTests/DataServiceClientTests.cs rename to tests/UnitTests/DataServiceTests/DataServiceClientTests.cs diff --git a/tests/DataServiceTests/DataServiceTestHelper.cs b/tests/UnitTests/DataServiceTests/DataServiceTestHelper.cs similarity index 100% rename from tests/DataServiceTests/DataServiceTestHelper.cs rename to tests/UnitTests/DataServiceTests/DataServiceTestHelper.cs diff --git a/tests/DataServiceTests/DataServiceTests.csproj b/tests/UnitTests/DataServiceTests/DataServiceTests.csproj similarity index 60% rename from tests/DataServiceTests/DataServiceTests.csproj rename to tests/UnitTests/DataServiceTests/DataServiceTests.csproj index 0a9e861d6..a3ce44213 100644 --- a/tests/DataServiceTests/DataServiceTests.csproj +++ b/tests/UnitTests/DataServiceTests/DataServiceTests.csproj @@ -22,11 +22,11 @@ - - - - - + + + + + diff --git a/tests/DataServiceTests/MockDataServiceAccessor.cs b/tests/UnitTests/DataServiceTests/MockDataServiceAccessor.cs similarity index 100% rename from tests/DataServiceTests/MockDataServiceAccessor.cs rename to tests/UnitTests/DataServiceTests/MockDataServiceAccessor.cs