Skip to content

Commit ef600c5

Browse files
committed
Split unit test project
1 parent f329e4c commit ef600c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+55
-15
lines changed

BizHawk.sln

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.WinForms.Controls",
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{74391239-9BC1-40CE-A3D7-180737C5302A}"
3737
EndProject
38-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Tests", "src\BizHawk.Tests\BizHawk.Tests.csproj", "{284E19E2-661D-4A7D-864A-AC2FC91E7C25}"
38+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Tests.Client.Common", "src\BizHawk.Tests.Client.Common\BizHawk.Tests.Client.Common.csproj", "{284E19E2-661D-4A7D-864A-AC2FC91E7C25}"
39+
EndProject
40+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Tests.Common", "src\BizHawk.Tests.Common\BizHawk.Tests.Common.csproj", "{39546396-C4D0-45D3-8C6A-D56D29B5BD72}"
41+
EndProject
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Tests.Emulation.Common", "src\BizHawk.Tests.Emulation.Common\BizHawk.Tests.Emulation.Common.csproj", "{D95E2B42-757A-4D19-8A76-84C6350BAD8D}"
3943
EndProject
4044
Global
4145
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -99,6 +103,14 @@ Global
99103
{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Debug|Any CPU.Build.0 = Debug|Any CPU
100104
{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Release|Any CPU.ActiveCfg = Release|Any CPU
101105
{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Release|Any CPU.Build.0 = Release|Any CPU
106+
{39546396-C4D0-45D3-8C6A-D56D29B5BD72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107+
{39546396-C4D0-45D3-8C6A-D56D29B5BD72}.Debug|Any CPU.Build.0 = Debug|Any CPU
108+
{39546396-C4D0-45D3-8C6A-D56D29B5BD72}.Release|Any CPU.ActiveCfg = Release|Any CPU
109+
{39546396-C4D0-45D3-8C6A-D56D29B5BD72}.Release|Any CPU.Build.0 = Release|Any CPU
110+
{D95E2B42-757A-4D19-8A76-84C6350BAD8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
111+
{D95E2B42-757A-4D19-8A76-84C6350BAD8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
112+
{D95E2B42-757A-4D19-8A76-84C6350BAD8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
113+
{D95E2B42-757A-4D19-8A76-84C6350BAD8D}.Release|Any CPU.Build.0 = Release|Any CPU
102114
EndGlobalSection
103115
GlobalSection(SolutionProperties) = preSolution
104116
HideSolutionNode = FALSE
@@ -112,6 +124,8 @@ Global
112124
{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
113125
{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
114126
{284E19E2-661D-4A7D-864A-AC2FC91E7C25} = {74391239-9BC1-40CE-A3D7-180737C5302A}
127+
{39546396-C4D0-45D3-8C6A-D56D29B5BD72} = {74391239-9BC1-40CE-A3D7-180737C5302A}
128+
{D95E2B42-757A-4D19-8A76-84C6350BAD8D} = {74391239-9BC1-40CE-A3D7-180737C5302A}
115129
EndGlobalSection
116130
GlobalSection(ExtensibilityGlobals) = postSolution
117131
SolutionGuid = {9B9E4316-9185-412E-B951-A63355ACA956}
File renamed without changes.

src/BizHawk.Tests/Client.Common/ArrayConversionTests.cs renamed to src/BizHawk.Tests.Client.Common/ArrayConversionTests.cs

File renamed without changes.

src/BizHawk.Tests/BizHawk.Tests.csproj renamed to src/BizHawk.Tests.Client.Common/BizHawk.Tests.Client.Common.csproj

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,15 @@
22
<PropertyGroup>
33
<TargetFramework>net48</TargetFramework>
44
</PropertyGroup>
5-
<Import Project="../TestProjects.props" />
6-
<PropertyGroup>
7-
<DefineConstants Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">$(DefineConstants);SKIP_PLATFORM_TESTS</DefineConstants>
8-
<MSTestAnalysisMode>All</MSTestAnalysisMode>
9-
<RunSettingsFilePath>$(MSBuildProjectDirectory)/../MainSln.runsettings</RunSettingsFilePath>
10-
</PropertyGroup>
5+
<Import Project="../MainSlnTest.props" />
116
<ItemGroup>
127
<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
8+
<ProjectReference Include="$(ProjectDir)../BizHawk.Tests.Common/BizHawk.Tests.Common.csproj" />
139
<Reference Include="NLua, Version=1.4.1.0, Culture=neutral, PublicKeyToken=null, processorArchitecture=MSIL" SpecificVersion="false" HintPath="$(ProjectDir)../../References/NLua.dll" Private="true" />
1410
<None Include="$(ProjectDir)../../Assets/dll/lua54.dll" CopyToOutputDirectory="PreserveNewest" />
1511
<!-- CHECKME: Does liblua5.4.so from a Linux host get picked up correctly? -->
1612
<None Include="$(ProjectDir)../../Assets/dll/libbizhash.*" CopyToOutputDirectory="PreserveNewest" />
1713
<None Include="$(ProjectDir)../../Assets/dll/libzstd.*" CopyToOutputDirectory="PreserveNewest" />
18-
<Using Include="BizHawk.Tests" />
19-
</ItemGroup>
20-
<PropertyGroup>
21-
<!-- Works around weird issue with IsExternalInit specifically, cause is likely related to https://github.com/Sergio0694/PolySharp/issues/48? -->
22-
<PolySharpExcludeTypeForwardedToDeclarations>true</PolySharpExcludeTypeForwardedToDeclarations>
23-
</PropertyGroup>
24-
<ItemGroup>
2514
<EmbeddedResource Include="data/**/*" />
2615
</ItemGroup>
2716
</Project>

src/BizHawk.Tests/Client.Common/Display/InputDisplayTests.cs renamed to src/BizHawk.Tests.Client.Common/Display/InputDisplayTests.cs

File renamed without changes.

src/BizHawk.Tests/EmbeddedData.cs renamed to src/BizHawk.Tests.Client.Common/EmbeddedData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static class EmbeddedData
99

1010
public static Stream GetStream(string group, string embedPath)
1111
{
12-
var fullPath = $"BizHawk.Tests.data.{group}.{embedPath}";
12+
var fullPath = $"BizHawk.Tests.Client.Common.data.{group}.{embedPath}";
1313
return Asm.GetManifestResourceStream(fullPath) ?? throw new InvalidOperationException($"Could not find the embedded resource {fullPath}");
1414
}
1515
}

src/BizHawk.Tests/Client.Common/Movie/LogGeneratorTests.cs renamed to src/BizHawk.Tests.Client.Common/Movie/LogGeneratorTests.cs

File renamed without changes.

src/BizHawk.Tests/Client.Common/Movie/MovieServiceTests.cs renamed to src/BizHawk.Tests.Client.Common/Movie/MovieServiceTests.cs

File renamed without changes.

src/BizHawk.Tests/Client.Common/Movie/ZwinderStateManagerTests.cs renamed to src/BizHawk.Tests.Client.Common/Movie/ZwinderStateManagerTests.cs

File renamed without changes.

src/BizHawk.Tests/PlatformTests/Client.Common.movie/MovieConversionExtensionTests.cs renamed to src/BizHawk.Tests.Client.Common/PlatformTests/Client.Common.movie/MovieConversionExtensionTests.cs

File renamed without changes.

0 commit comments

Comments
 (0)