Skip to content

Commit 99b69f4

Browse files
albertospeltaalbertospelta
authored
Refactor folder structure by moving test projects into tests folder (#153)
* Refactor folder structure by moving test projects into tests folder * Update project and package references
1 parent cbf1589 commit 99b69f4

24 files changed

+89
-118
lines changed

‎VertiPaq-Analyzer.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.ViewVpaExport", "src\Da
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax", "src\Dax.Vpax\Dax.Vpax.csproj", "{D12894AE-3693-411C-A2A3-4109D2DBC4B0}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Metadata.Tests", "src\Dax.Metadata.Tests\Dax.Metadata.Tests.csproj", "{705EDB3D-10CC-4D3E-B85D-78CB23924E44}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Metadata.Tests", "tests\Dax.Metadata.Tests\Dax.Metadata.Tests.csproj", "{705EDB3D-10CC-4D3E-B85D-78CB23924E44}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Model.Extractor.Tests", "src\Dax.Model.Extractor.Tests\Dax.Model.Extractor.Tests.csproj", "{D6CA44D3-C324-4B7E-97E3-D5688997A297}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Model.Extractor.Tests", "tests\Dax.Model.Extractor.Tests\Dax.Model.Extractor.Tests.csproj", "{D6CA44D3-C324-4B7E-97E3-D5688997A297}"
1919
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Tests", "src\Dax.Vpax.Tests\Dax.Vpax.Tests.csproj", "{CF873E93-AE2F-4A25-A71C-A68EB876C7A0}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Tests", "tests\Dax.Vpax.Tests\Dax.Vpax.Tests.csproj", "{CF873E93-AE2F-4A25-A71C-A68EB876C7A0}"
2121
EndProject
2222
Global
2323
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/Dax.Metadata.Tests/Dax.Metadata.Tests.csproj

-37
This file was deleted.

‎src/Dax.Model.Extractor.Tests/Dax.Model.Extractor.Tests.csproj

-36
This file was deleted.

‎src/Dax.Vpax.Tests/Dax.Vpax.Tests.csproj

-34
This file was deleted.

‎src/Directory.Packages.props

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<Project>
2+
23
<PropertyGroup>
34
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
45
</PropertyGroup>
6+
57
<PropertyGroup>
68
<MicrosoftAnalysisServicesVersion>19.77.0</MicrosoftAnalysisServicesVersion>
79
</PropertyGroup>
10+
811
<ItemGroup>
912
<PackageVersion Include="Microsoft.AnalysisServices.retail.amd64" Version="$(MicrosoftAnalysisServicesVersion)" />
1013
<PackageVersion Include="Microsoft.AnalysisServices.NetCore.retail.amd64" Version="$(MicrosoftAnalysisServicesVersion)" />
@@ -13,10 +16,6 @@
1316
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
1417
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
1518
<PackageVersion Include="System.IO.Packaging" Version="6.0.0" />
16-
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
17-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
18-
<PackageVersion Include="xunit" Version="2.6.6" />
19-
<!-- pinned dependencies required to test out-of-support target frameworks -->
20-
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.4.5]" />
2119
</ItemGroup>
20+
2221
</Project>

‎tests/Dax.Metadata.Tests/Dax.Metadata.Tests.csproj

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<ItemGroup>
4+
<ProjectReference Include="..\..\src\Dax.Metadata\Dax.Metadata.csproj" />
5+
<ProjectReference Include="..\..\src\Dax.Vpax\Dax.Vpax.csproj" />
6+
</ItemGroup>
7+
8+
<ItemGroup>
9+
<None Include="..\Dax.Vpax.Tests\_data\Contoso.vpax" Link="_data\Contoso.vpax">
10+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
11+
</None>
12+
<None Include="..\Dax.Vpax.Tests\_data\Vaccini.vpax" Link="_data\Vaccini.vpax">
13+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
14+
</None>
15+
</ItemGroup>
16+
17+
</Project>

‎src/Dax.Metadata.Tests/DaxMetadataFixture.cs ‎tests/Dax.Metadata.Tests/DaxMetadataFixture.cs

File renamed without changes.

‎src/Dax.Metadata.Tests/ModelTests.cs ‎tests/Dax.Metadata.Tests/ModelTests.cs

File renamed without changes.

‎tests/Dax.Model.Extractor.Tests/Dax.Model.Extractor.Tests.csproj

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<ItemGroup>
4+
<ProjectReference Include="..\..\src\Dax.Model.Extractor\Dax.Model.Extractor.csproj" />
5+
</ItemGroup>
6+
7+
<ItemGroup>
8+
<None Include="..\Dax.Vpax.Tests\_data\Contoso.bim" Link="_data\Contoso.bim">
9+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10+
</None>
11+
<None Include="..\Dax.Vpax.Tests\_data\Vaccini.bim" Link="_data\Vaccini.bim">
12+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
13+
</None>
14+
</ItemGroup>
15+
16+
</Project>

‎src/Dax.Model.Extractor.Tests/DaxModelFixture.cs ‎tests/Dax.Model.Extractor.Tests/DaxModelFixture.cs

File renamed without changes.

‎src/Dax.Model.Extractor.Tests/DaxModelTests.cs ‎tests/Dax.Model.Extractor.Tests/DaxModelTests.cs

File renamed without changes.

‎src/Dax.Model.Extractor.Tests/TomExtractorFixture.cs ‎tests/Dax.Model.Extractor.Tests/TomExtractorFixture.cs

File renamed without changes.

‎src/Dax.Model.Extractor.Tests/TomExtractorTests.cs ‎tests/Dax.Model.Extractor.Tests/TomExtractorTests.cs

File renamed without changes.

‎tests/Dax.Vpax.Tests/Dax.Vpax.Tests.csproj

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<ItemGroup>
4+
<ProjectReference Include="..\..\src\Dax.Model.Extractor\Dax.Model.Extractor.csproj" />
5+
<ProjectReference Include="..\..\src\Dax.Vpax\Dax.Vpax.csproj" />
6+
</ItemGroup>
7+
8+
<ItemGroup>
9+
<None Update="_data\**">
10+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
11+
</None>
12+
</ItemGroup>
13+
14+
</Project>

‎src/Dax.Vpax.Tests/VpaxToolTests.cs ‎tests/Dax.Vpax.Tests/VpaxToolTests.cs

File renamed without changes.

‎src/Dax.Vpax.Tests/_data/Contoso.bim ‎tests/Dax.Vpax.Tests/_data/Contoso.bim

File renamed without changes.

‎src/Dax.Vpax.Tests/_data/Contoso.pbix ‎tests/Dax.Vpax.Tests/_data/Contoso.pbix

File renamed without changes.

‎src/Dax.Vpax.Tests/_data/Contoso.vpax ‎tests/Dax.Vpax.Tests/_data/Contoso.vpax

File renamed without changes.

‎src/Dax.Vpax.Tests/_data/Vaccini.bim ‎tests/Dax.Vpax.Tests/_data/Vaccini.bim

File renamed without changes.

‎src/Dax.Vpax.Tests/_data/Vaccini.pbix ‎tests/Dax.Vpax.Tests/_data/Vaccini.pbix

File renamed without changes.

‎src/Dax.Vpax.Tests/_data/Vaccini.vpax ‎tests/Dax.Vpax.Tests/_data/Vaccini.vpax

File renamed without changes.

‎tests/Directory.Build.props

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
5+
<Nullable>disable</Nullable>
6+
<LangVersion>12.0</LangVersion>
7+
<!-- It's ok if a test target has exited support. Disable NETSSDK1138 warning -->
8+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
13+
<PackageReference Include="xunit" />
14+
</ItemGroup>
15+
16+
</Project>

‎tests/Directory.Packages.props

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
9+
<PackageVersion Include="xunit" Version="2.6.6" />
10+
<!-- Global Package References -->
11+
<GlobalPackageReference Include="coverlet.collector" Version="6.0.0" />
12+
<!-- Pinned dependency required to test out-of-support target frameworks -->
13+
<GlobalPackageReference Include="xunit.runner.visualstudio" Version="[2.4.5]" />
14+
</ItemGroup>
15+
16+
</Project>

‎utils/VertiPaq-Analyzer-WithTestUtils.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWpfPowerBI", "TestWpfPo
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Metadata", "..\src\Dax.Metadata\Dax.Metadata.csproj", "{E6041BDA-DCA0-4EF4-85CE-799BD763D5FA}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Metadata.Tests", "..\src\Dax.Metadata.Tests\Dax.Metadata.Tests.csproj", "{4E775D58-05B1-4FDE-A25C-001A3B5D1B8B}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Metadata.Tests", "..\tests\Dax.Metadata.Tests\Dax.Metadata.Tests.csproj", "{4E775D58-05B1-4FDE-A25C-001A3B5D1B8B}"
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Model.Extractor", "..\src\Dax.Model.Extractor\Dax.Model.Extractor.csproj", "{1E17B04F-9FCB-459A-9368-78639ED37FD4}"
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Model.Extractor.Tests", "..\src\Dax.Model.Extractor.Tests\Dax.Model.Extractor.Tests.csproj", "{416BA3AB-6CD4-4167-AD5A-EC4CC657E606}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Model.Extractor.Tests", "..\tests\Dax.Model.Extractor.Tests\Dax.Model.Extractor.Tests.csproj", "{416BA3AB-6CD4-4167-AD5A-EC4CC657E606}"
2323
EndProject
2424
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.ViewModel", "..\src\Dax.ViewModel\Dax.ViewModel.csproj", "{E7571992-F457-4683-846F-B7C0CAA1BFC5}"
2525
EndProject
2626
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.ViewVpaExport", "..\src\Dax.ViewVpaExport\Dax.ViewVpaExport.csproj", "{1B52EDBC-4E37-453A-AE88-94153C3396E7}"
2727
EndProject
2828
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax", "..\src\Dax.Vpax\Dax.Vpax.csproj", "{7ED1E91E-D9E9-4C13-926F-4BD0BFE63615}"
2929
EndProject
30-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Tests", "..\src\Dax.Vpax.Tests\Dax.Vpax.Tests.csproj", "{E06BCFE7-479F-4208-B6E8-2CC7A4B1D738}"
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Tests", "..\tests\Dax.Vpax.Tests\Dax.Vpax.Tests.csproj", "{E06BCFE7-479F-4208-B6E8-2CC7A4B1D738}"
3131
EndProject
3232
Global
3333
GlobalSection(SolutionConfigurationPlatforms) = preSolution

0 commit comments

Comments
 (0)