diff --git a/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln b/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln index 9c23233..a50d9e8 100644 --- a/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln +++ b/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln @@ -5,16 +5,12 @@ VisualStudioVersion = 16.0.30804.86 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GameServices", "PokerHanderSorterService\GameServices.csproj", "{F69F2713-5791-42A6-B850-F40CE612738C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandSorterServiceTests", "PokerHandSorterServiceTests\PokerHandSorterServiceTests.csproj", "{199FF6FD-05A3-4046-BB78-4F72A84BFE9A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandDomainModels", "PokerHandDomain\PokerHandDomainModels.csproj", "{0C1F6175-BC7D-43A4-8295-50B7355F92AF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandLogicRuleHandlers", "PokerHandLogicHandler\PokerHandLogicRuleHandlers.csproj", "{ADE26051-852B-44EC-AAD3-9F7F689E0220}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F1697E6C-9248-4530-8CD6-97963E74A3B4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandLogicHandlersTests", "PokerHandLogicHandlerTests\PokerHandLogicHandlersTests.csproj", "{17BB428B-CF9F-4180-B4F8-45523599E9EB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandDomainModels.Extensions", "PokerHandDomainModels.Extensions\PokerHandDomainModels.Extensions.csproj", "{9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interfaces", "Interfaces", "{28B1A074-245B-4D37-B269-88BCA51C84DF}" @@ -35,6 +31,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GameFramework", "GameFramew EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandConsole", "PokerHandConsoleApp\PokerHandConsole.csproj", "{33AA77B7-6070-4D3C-9D28-0A865918AEA7}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandLogicHandlersTests", "Tests\PokerHandLogicHandlerTests\PokerHandLogicHandlersTests.csproj", "{E42C5890-2CEF-40FE-9C23-DC34CB9E9E48}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandSorterServiceTests", "Tests\PokerHandSorterServiceTests\PokerHandSorterServiceTests.csproj", "{3F6A6023-D23A-4081-8FF3-FF1E2211046C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,10 +45,6 @@ Global {F69F2713-5791-42A6-B850-F40CE612738C}.Debug|Any CPU.Build.0 = Debug|Any CPU {F69F2713-5791-42A6-B850-F40CE612738C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F69F2713-5791-42A6-B850-F40CE612738C}.Release|Any CPU.Build.0 = Release|Any CPU - {199FF6FD-05A3-4046-BB78-4F72A84BFE9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {199FF6FD-05A3-4046-BB78-4F72A84BFE9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {199FF6FD-05A3-4046-BB78-4F72A84BFE9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {199FF6FD-05A3-4046-BB78-4F72A84BFE9A}.Release|Any CPU.Build.0 = Release|Any CPU {0C1F6175-BC7D-43A4-8295-50B7355F92AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0C1F6175-BC7D-43A4-8295-50B7355F92AF}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C1F6175-BC7D-43A4-8295-50B7355F92AF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -57,10 +53,6 @@ Global {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Debug|Any CPU.Build.0 = Debug|Any CPU {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Release|Any CPU.Build.0 = Release|Any CPU - {17BB428B-CF9F-4180-B4F8-45523599E9EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17BB428B-CF9F-4180-B4F8-45523599E9EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17BB428B-CF9F-4180-B4F8-45523599E9EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17BB428B-CF9F-4180-B4F8-45523599E9EB}.Release|Any CPU.Build.0 = Release|Any CPU {9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4}.Debug|Any CPU.Build.0 = Debug|Any CPU {9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -73,21 +65,29 @@ Global {33AA77B7-6070-4D3C-9D28-0A865918AEA7}.Debug|Any CPU.Build.0 = Debug|Any CPU {33AA77B7-6070-4D3C-9D28-0A865918AEA7}.Release|Any CPU.ActiveCfg = Release|Any CPU {33AA77B7-6070-4D3C-9D28-0A865918AEA7}.Release|Any CPU.Build.0 = Release|Any CPU + {E42C5890-2CEF-40FE-9C23-DC34CB9E9E48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E42C5890-2CEF-40FE-9C23-DC34CB9E9E48}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E42C5890-2CEF-40FE-9C23-DC34CB9E9E48}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E42C5890-2CEF-40FE-9C23-DC34CB9E9E48}.Release|Any CPU.Build.0 = Release|Any CPU + {3F6A6023-D23A-4081-8FF3-FF1E2211046C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F6A6023-D23A-4081-8FF3-FF1E2211046C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F6A6023-D23A-4081-8FF3-FF1E2211046C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F6A6023-D23A-4081-8FF3-FF1E2211046C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {F69F2713-5791-42A6-B850-F40CE612738C} = {F19BAA81-46CD-4736-8AE3-2E62B93C723E} - {199FF6FD-05A3-4046-BB78-4F72A84BFE9A} = {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} {0C1F6175-BC7D-43A4-8295-50B7355F92AF} = {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} {ADE26051-852B-44EC-AAD3-9F7F689E0220} = {2240E6A7-3D12-45AD-9262-B2BA7AD8DEEE} - {17BB428B-CF9F-4180-B4F8-45523599E9EB} = {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} {9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4} = {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} = {D4555EBA-DE48-4BC2-A173-01F92CC09079} {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} = {F1697E6C-9248-4530-8CD6-97963E74A3B4} {2240E6A7-3D12-45AD-9262-B2BA7AD8DEEE} = {EABBA59C-09F4-48D1-9C37-8F20E0C93992} {FCFBE5D4-8ADC-4498-AEB6-454FE4EE3B0E} = {28B1A074-245B-4D37-B269-88BCA51C84DF} + {E42C5890-2CEF-40FE-9C23-DC34CB9E9E48} = {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} + {3F6A6023-D23A-4081-8FF3-FF1E2211046C} = {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1DDA806A-1A88-432B-84BD-03C8200EF17C} diff --git a/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj b/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj index f4f6851..ca5c678 100644 --- a/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj +++ b/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj @@ -5,7 +5,6 @@ - diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/DoublePairFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/DoublePairFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/DoublePairFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/DoublePairFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/FlushFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/FlushFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/FlushFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/FlushFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/FourOfAKindFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/FourOfAKindFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/FourOfAKindFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/FourOfAKindFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/FullHouseFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/FullHouseFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/FullHouseFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/FullHouseFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/HighestValueFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/HighestValueFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/HighestValueFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/HighestValueFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/PairFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/PairFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/PairFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/PairFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/RoyalFlushFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/RoyalFlushFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/RoyalFlushFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/RoyalFlushFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/StraightFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/StraightFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/StraightFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/StraightFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/StraightFlushFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/StraightFlushFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/StraightFlushFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/StraightFlushFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/ThreeOfAKindFinderTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/ThreeOfAKindFinderTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/Finders/ThreeOfAKindFinderTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/Finders/ThreeOfAKindFinderTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj similarity index 67% rename from PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj rename to PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj index f846364..715d311 100644 --- a/PokerHandSorterConsoleApp/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj +++ b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj @@ -20,7 +20,10 @@ - + + + + diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/DetermineRankTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/DetermineRankTests.cs similarity index 97% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/DetermineRankTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/DetermineRankTests.cs index e47b2b7..b0eb690 100644 --- a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/DetermineRankTests.cs +++ b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/DetermineRankTests.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; +using System.Linq; using GameService; diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/ExecuteAllGamesAndProcessReportMethodTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/ExecuteAllGamesAndProcessReportMethodTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/ExecuteAllGamesAndProcessReportMethodTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/ExecuteAllGamesAndProcessReportMethodTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/GetTheHighestCardofTheRankMethodTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/GetTheHighestCardofTheRankMethodTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/GetTheHighestCardofTheRankMethodTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/GetTheHighestCardofTheRankMethodTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/Input-to-loop-issue.txt b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/Input-to-loop-issue.txt similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/Input-to-loop-issue.txt rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/Input-to-loop-issue.txt diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/poker-hands.txt b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/poker-hands.txt similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/poker-hands.txt rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/poker-hands.txt diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/simple-DetermineRank-sample.txt b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/simple-DetermineRank-sample.txt similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/simple-DetermineRank-sample.txt rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/simple-DetermineRank-sample.txt diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/simple-setupAllmatches-sample.txt b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/simple-setupAllmatches-sample.txt similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/simple-setupAllmatches-sample.txt rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/simple-setupAllmatches-sample.txt diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/simple-setupmatch-sample.txt b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/simple-setupmatch-sample.txt similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/InputSamples/simple-setupmatch-sample.txt rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/InputSamples/simple-setupmatch-sample.txt diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/PlayPokerMethodTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PlayPokerMethodTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/PlayPokerMethodTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PlayPokerMethodTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj similarity index 77% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj index 6565164..3877d28 100644 --- a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj +++ b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj @@ -36,7 +36,11 @@ - + + + + + diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/SetupAllMatchesMethodTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupAllMatchesMethodTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/SetupAllMatchesMethodTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupAllMatchesMethodTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/SetupMatchMethodTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupMatchMethodTests.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/SetupMatchMethodTests.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupMatchMethodTests.cs diff --git a/PokerHandSorterConsoleApp/PokerHandSorterServiceTests/Utils/TestSampleDataExtractor.cs b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/Utils/TestSampleDataExtractor.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandSorterServiceTests/Utils/TestSampleDataExtractor.cs rename to PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/Utils/TestSampleDataExtractor.cs