Move tests to own folder

Move the tests to the "tests" folder, leaving just the library in "src".
gomete · Oct 13, 2018 · ad8b408 · ad8b408
1 parent b74ac1d
commit ad8b408
Show file tree

Hide file tree

Showing 41 changed files with 30 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ addons:
 
 install:
   - git clone https://github.com/etsy/statsd.git
-  - node ./statsd/stats.js ./src/JustEat.StatsD.Tests/statsdconfig.js &
+  - node ./statsd/stats.js ./tests/JustEat.StatsD.Tests/statsdconfig.js &
 
 script:
   - ./build.sh
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
       "args": [
         "test"
       ],
-      "cwd": "${workspaceRoot}/src/JustEat.StatsD.Tests",
+      "cwd": "${workspaceRoot}/tests/JustEat.StatsD.Tests",
       "console": "internalConsole",
       "stopAtEntry": false,
       "internalConsoleOptions": "openOnSessionStart"

diff --git a/Build.ps1 b/Build.ps1
@@ -79,7 +79,7 @@ $projects = @(
 )
 
 $testProjects = @(
-    (Join-Path $solutionPath "src\JustEat.StatsD.Tests\JustEat.StatsD.Tests.csproj")
+    (Join-Path $solutionPath "tests\JustEat.StatsD.Tests\JustEat.StatsD.Tests.csproj")
 )
 
 $packageProjects = @(

diff --git a/JustEat.StatsD.sln b/JustEat.StatsD.sln
@@ -13,19 +13,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{06BE4D
 		build.sh = build.sh
 		CHANGELOG.md = CHANGELOG.md
 		CONTRIBUTING.md = CONTRIBUTING.md
-		global.json = global.json
 		Directory.Build.props = Directory.Build.props
-		version.props = version.props
+		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md
 		release.ps1 = release.ps1
+		version.props = version.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JustEat.StatsD", "src\JustEat.StatsD\JustEat.StatsD.csproj", "{6A338D71-E28B-455A-9E9D-3667EE659542}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JustEat.StatsD.Tests", "src\JustEat.StatsD.Tests\JustEat.StatsD.Tests.csproj", "{8D9AA1A3-2619-4800-AAEC-84AE4DA15455}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CC2F794C-462F-4545-AEEA-13E34A37528E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "src\Benchmark\Benchmark.csproj", "{537F16FC-D50D-4260-8B16-3C3F47A4DC4D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JustEat.StatsD.Tests", "tests\JustEat.StatsD.Tests\JustEat.StatsD.Tests.csproj", "{5E1B60D3-3F67-4753-8C6C-AC1795978A8D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "tests\Benchmark\Benchmark.csproj", "{4C48F92C-8F51-403B-B3DD-281C522C1C7E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{48F0CB2A-4B74-47F2-9234-18147FA389F9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,18 +41,23 @@ Global
 		{6A338D71-E28B-455A-9E9D-3667EE659542}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A338D71-E28B-455A-9E9D-3667EE659542}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A338D71-E28B-455A-9E9D-3667EE659542}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D9AA1A3-2619-4800-AAEC-84AE4DA15455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D9AA1A3-2619-4800-AAEC-84AE4DA15455}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D9AA1A3-2619-4800-AAEC-84AE4DA15455}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D9AA1A3-2619-4800-AAEC-84AE4DA15455}.Release|Any CPU.Build.0 = Release|Any CPU
-		{537F16FC-D50D-4260-8B16-3C3F47A4DC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{537F16FC-D50D-4260-8B16-3C3F47A4DC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{537F16FC-D50D-4260-8B16-3C3F47A4DC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{537F16FC-D50D-4260-8B16-3C3F47A4DC4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E1B60D3-3F67-4753-8C6C-AC1795978A8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E1B60D3-3F67-4753-8C6C-AC1795978A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E1B60D3-3F67-4753-8C6C-AC1795978A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E1B60D3-3F67-4753-8C6C-AC1795978A8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C48F92C-8F51-403B-B3DD-281C522C1C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C48F92C-8F51-403B-B3DD-281C522C1C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C48F92C-8F51-403B-B3DD-281C522C1C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C48F92C-8F51-403B-B3DD-281C522C1C7E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{6A338D71-E28B-455A-9E9D-3667EE659542} = {48F0CB2A-4B74-47F2-9234-18147FA389F9}
+		{5E1B60D3-3F67-4753-8C6C-AC1795978A8D} = {CC2F794C-462F-4545-AEEA-13E34A37528E}
+		{4C48F92C-8F51-403B-B3DD-281C522C1C7E} = {CC2F794C-462F-4545-AEEA-13E34A37528E}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {72443623-DCE7-43AB-A24E-1D08807E1F72}
 	EndGlobalSection

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,7 +6,7 @@ environment:
   NUGET_XMLDOC_MODE: skip
 install:
   - git clone https://github.com/etsy/statsd.git ..\statsd
-  - ps: Start-Process "node" -ArgumentList "..\statsd\stats.js .\src\JustEat.StatsD.Tests\statsdconfig.js" -WindowStyle Hidden
+  - ps: Start-Process "node" -ArgumentList "..\statsd\stats.js .\tests\JustEat.StatsD.Tests\statsdconfig.js" -WindowStyle Hidden
   - ps: .\SetAppVeyorBuildVersion.ps1
 build_script:
   - ps: .\Build.ps1

diff --git a/build.sh b/build.sh
@@ -43,5 +43,5 @@ fi
 dotnet build src/JustEat.StatsD/JustEat.StatsD.csproj --output $artifacts --configuration $configuration --framework "netstandard2.0" || exit 1
 
 if [ $skipTests == 0 ]; then
-    dotnet test src/JustEat.StatsD.Tests/JustEat.StatsD.Tests.csproj --output $artifacts --configuration $configuration --framework "netcoreapp2.1" || exit 1
+    dotnet test tests/JustEat.StatsD.Tests/JustEat.StatsD.Tests.csproj --output $artifacts --configuration $configuration --framework "netcoreapp2.1" || exit 1
 fi
diff --git a/src/Benchmark/Benchmark.csproj → tests/Benchmark/Benchmark.csproj b/src/Benchmark/Benchmark.csproj → tests/Benchmark/Benchmark.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>$(NoWarn);CA1001;CA1822</NoWarn>
     <OutputType>Exe</OutputType>
@@ -9,6 +9,6 @@
     <PackageReference Include="BenchmarkDotNet" Version="0.11.1" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\JustEat.StatsD\JustEat.StatsD.csproj" />
+    <ProjectReference Include="..\..\src\JustEat.StatsD\JustEat.StatsD.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Benchmark/FormatterBenchmark.cs → tests/Benchmark/FormatterBenchmark.cs b/src/Benchmark/FormatterBenchmark.cs → tests/Benchmark/FormatterBenchmark.cs
diff --git a/src/Benchmark/Program.cs → tests/Benchmark/Program.cs b/src/Benchmark/Program.cs → tests/Benchmark/Program.cs
diff --git a/src/Benchmark/StatSendingBenchmark.cs → tests/Benchmark/StatSendingBenchmark.cs b/src/Benchmark/StatSendingBenchmark.cs → tests/Benchmark/StatSendingBenchmark.cs
diff --git a/src/Benchmark/UdpStatSendingBenchmark.cs → tests/Benchmark/UdpStatSendingBenchmark.cs b/src/Benchmark/UdpStatSendingBenchmark.cs → tests/Benchmark/UdpStatSendingBenchmark.cs
diff --git a/src/Benchmark/UdpTransportBenchmark.cs → tests/Benchmark/UdpTransportBenchmark.cs b/src/Benchmark/UdpTransportBenchmark.cs → tests/Benchmark/UdpTransportBenchmark.cs
diff --git a/src/Benchmark/Utf8FormatterBenchmark.cs → tests/Benchmark/Utf8FormatterBenchmark.cs b/src/Benchmark/Utf8FormatterBenchmark.cs → tests/Benchmark/Utf8FormatterBenchmark.cs
diff --git a/....Tests/BufferBasedStatsDPublisherTests.cs → ....Tests/BufferBasedStatsDPublisherTests.cs b/....Tests/BufferBasedStatsDPublisherTests.cs → ....Tests/BufferBasedStatsDPublisherTests.cs
diff --git a/...pointLookups/CachedEndpointSourceTests.cs → ...pointLookups/CachedEndpointSourceTests.cs b/...pointLookups/CachedEndpointSourceTests.cs → ...pointLookups/CachedEndpointSourceTests.cs
diff --git a/...Lookups/DnsLookupIpEndpointSourceTests.cs → ...Lookups/DnsLookupIpEndpointSourceTests.cs b/...Lookups/DnsLookupIpEndpointSourceTests.cs → ...Lookups/DnsLookupIpEndpointSourceTests.cs
diff --git a/...ts/EndpointLookups/EndpointParserTests.cs → ...ts/EndpointLookups/EndpointParserTests.cs b/...ts/EndpointLookups/EndpointParserTests.cs → ...ts/EndpointLookups/EndpointParserTests.cs
diff --git a/...ts/EndpointLookups/SimpleEndpointTests.cs → ...ts/EndpointLookups/SimpleEndpointTests.cs b/...ts/EndpointLookups/SimpleEndpointTests.cs → ...ts/EndpointLookups/SimpleEndpointTests.cs
diff --git a/...tatsD.Tests/Extensions/ExtensionsTests.cs → ...tatsD.Tests/Extensions/ExtensionsTests.cs b/...tatsD.Tests/Extensions/ExtensionsTests.cs → ...tatsD.Tests/Extensions/ExtensionsTests.cs
diff --git a/...sD.Tests/Extensions/FakeStatsPublisher.cs → ...sD.Tests/Extensions/FakeStatsPublisher.cs b/...sD.Tests/Extensions/FakeStatsPublisher.cs → ...sD.Tests/Extensions/FakeStatsPublisher.cs
diff --git a/...D.Tests/Extensions/PublisherAssertions.cs → ...D.Tests/Extensions/PublisherAssertions.cs b/...D.Tests/Extensions/PublisherAssertions.cs → ...D.Tests/Extensions/PublisherAssertions.cs
diff --git a/...ts/Extensions/SimpleTimerStatNameTests.cs → ...ts/Extensions/SimpleTimerStatNameTests.cs b/...ts/Extensions/SimpleTimerStatNameTests.cs → ...ts/Extensions/SimpleTimerStatNameTests.cs
diff --git a/...tatsD.Tests/Extensions/TimingConstants.cs → ...tatsD.Tests/Extensions/TimingConstants.cs b/...tatsD.Tests/Extensions/TimingConstants.cs → ...tatsD.Tests/Extensions/TimingConstants.cs
diff --git a/src/JustEat.StatsD.Tests/IntegrationTests.cs → .../JustEat.StatsD.Tests/IntegrationTests.cs b/src/JustEat.StatsD.Tests/IntegrationTests.cs → .../JustEat.StatsD.Tests/IntegrationTests.cs
diff --git a/....StatsD.Tests/JustEat.StatsD.Tests.csproj → ....StatsD.Tests/JustEat.StatsD.Tests.csproj b/....StatsD.Tests/JustEat.StatsD.Tests.csproj → ....StatsD.Tests/JustEat.StatsD.Tests.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>$(NoWarn);CA1707;CA2007</NoWarn>
     <RootNamespace>JustEat.StatsD</RootNamespace>
     <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\JustEat.StatsD\JustEat.StatsD.csproj" />
+    <ProjectReference Include="..\..\src\JustEat.StatsD\JustEat.StatsD.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />

diff --git a/...t.StatsD.Tests/Properties/AssemblyInfo.cs → ...t.StatsD.Tests/Properties/AssemblyInfo.cs b/...t.StatsD.Tests/Properties/AssemblyInfo.cs → ...t.StatsD.Tests/Properties/AssemblyInfo.cs
diff --git a/...tEat.StatsD.Tests/SocketTransportTests.cs → ...tEat.StatsD.Tests/SocketTransportTests.cs b/...tEat.StatsD.Tests/SocketTransportTests.cs → ...tEat.StatsD.Tests/SocketTransportTests.cs
diff --git a/...tEat.StatsD.Tests/StatsDPublisherTests.cs → ...tEat.StatsD.Tests/StatsDPublisherTests.cs b/...tEat.StatsD.Tests/StatsDPublisherTests.cs → ...tEat.StatsD.Tests/StatsDPublisherTests.cs
diff --git a/src/JustEat.StatsD.Tests/UdpListeners.cs → tests/JustEat.StatsD.Tests/UdpListeners.cs b/src/JustEat.StatsD.Tests/UdpListeners.cs → tests/JustEat.StatsD.Tests/UdpListeners.cs
diff --git a/...at.StatsD.Tests/UdpListenersCollection.cs → ...at.StatsD.Tests/UdpListenersCollection.cs b/...at.StatsD.Tests/UdpListenersCollection.cs → ...at.StatsD.Tests/UdpListenersCollection.cs
diff --git a/...ustEat.StatsD.Tests/Utf8FormatterTests.cs → ...ustEat.StatsD.Tests/Utf8FormatterTests.cs b/...ustEat.StatsD.Tests/Utf8FormatterTests.cs → ...ustEat.StatsD.Tests/Utf8FormatterTests.cs
diff --git a/...atsD.Tests/WhenCreatingStatsDPublisher.cs → ...atsD.Tests/WhenCreatingStatsDPublisher.cs b/...atsD.Tests/WhenCreatingStatsDPublisher.cs → ...atsD.Tests/WhenCreatingStatsDPublisher.cs
diff --git a/...Eat.StatsD.Tests/WhenRecordingCounters.cs → ...Eat.StatsD.Tests/WhenRecordingCounters.cs b/...Eat.StatsD.Tests/WhenRecordingCounters.cs → ...Eat.StatsD.Tests/WhenRecordingCounters.cs
diff --git a/...stEat.StatsD.Tests/WhenRecordingGauges.cs → ...stEat.StatsD.Tests/WhenRecordingGauges.cs b/...stEat.StatsD.Tests/WhenRecordingGauges.cs → ...stEat.StatsD.Tests/WhenRecordingGauges.cs
diff --git a/...stEat.StatsD.Tests/WhenRecordingTimers.cs → ...stEat.StatsD.Tests/WhenRecordingTimers.cs b/...stEat.StatsD.Tests/WhenRecordingTimers.cs → ...stEat.StatsD.Tests/WhenRecordingTimers.cs
diff --git a/...Eat.StatsD.Tests/WhenRegisteringStatsD.cs → ...Eat.StatsD.Tests/WhenRegisteringStatsD.cs b/...Eat.StatsD.Tests/WhenRegisteringStatsD.cs → ...Eat.StatsD.Tests/WhenRegisteringStatsD.cs
diff --git a/...at.StatsD.Tests/WhenTheTransportThrows.cs → ...at.StatsD.Tests/WhenTheTransportThrows.cs b/...at.StatsD.Tests/WhenTheTransportThrows.cs → ...at.StatsD.Tests/WhenTheTransportThrows.cs
diff --git a/...sD.Tests/WhenUsingBufferBasedPublisher.cs → ...sD.Tests/WhenUsingBufferBasedPublisher.cs b/...sD.Tests/WhenUsingBufferBasedPublisher.cs → ...sD.Tests/WhenUsingBufferBasedPublisher.cs
diff --git a/...Eat.StatsD.Tests/WhenUsingUdpTransport.cs → ...Eat.StatsD.Tests/WhenUsingUdpTransport.cs b/...Eat.StatsD.Tests/WhenUsingUdpTransport.cs → ...Eat.StatsD.Tests/WhenUsingUdpTransport.cs
diff --git a/src/JustEat.StatsD.Tests/statsdconfig.js → tests/JustEat.StatsD.Tests/statsdconfig.js b/src/JustEat.StatsD.Tests/statsdconfig.js → tests/JustEat.StatsD.Tests/statsdconfig.js
diff --git a/src/JustEat.StatsD.Tests/xunit.runner.json → tests/JustEat.StatsD.Tests/xunit.runner.json b/src/JustEat.StatsD.Tests/xunit.runner.json → tests/JustEat.StatsD.Tests/xunit.runner.json