diff --git a/src/NSpec.VsAdapter/NSpec.VsAdapter/NSpec.VsAdapter.csproj b/src/NSpec.VsAdapter/NSpec.VsAdapter/NSpec.VsAdapter.csproj index 5050002..4f10f85 100644 --- a/src/NSpec.VsAdapter/NSpec.VsAdapter/NSpec.VsAdapter.csproj +++ b/src/NSpec.VsAdapter/NSpec.VsAdapter/NSpec.VsAdapter.csproj @@ -46,12 +46,12 @@ C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Interfaces.dll - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\packages\nspec.1.0.5\lib\NSpec.dll + + ..\packages\nspec.1.0.7\lib\NSpec.dll True diff --git a/src/NSpec.VsAdapter/NSpec.VsAdapter/packages.config b/src/NSpec.VsAdapter/NSpec.VsAdapter/packages.config index b1b436d..3de8adb 100644 --- a/src/NSpec.VsAdapter/NSpec.VsAdapter/packages.config +++ b/src/NSpec.VsAdapter/NSpec.VsAdapter/packages.config @@ -1,8 +1,8 @@  - - + + diff --git a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/NSpec.VsAdapter.IntegrationTests.csproj b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/NSpec.VsAdapter.IntegrationTests.csproj index 3e8e444..5ef1bd4 100644 --- a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/NSpec.VsAdapter.IntegrationTests.csproj +++ b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/NSpec.VsAdapter.IntegrationTests.csproj @@ -35,19 +35,19 @@ 4 - - ..\..\packages\FluentAssertions.4.9.0\lib\net45\FluentAssertions.dll + + ..\..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.dll True - - ..\..\packages\FluentAssertions.4.9.0\lib\net45\FluentAssertions.Core.dll + + ..\..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.Core.dll True C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + ..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll True diff --git a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/TestConstants.cs b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/TestConstants.cs index 0ff7e23..9bdfa0d 100644 --- a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/TestConstants.cs +++ b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/TestConstants.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; using System.Text; using System.Threading.Tasks; @@ -11,7 +12,13 @@ static class TestConstants { static TestConstants() { - TestFolderPath = TestUtils.FirstCharToUpper(Path.GetFullPath(@"..\..\..\")); + string thisProjectDllPath = Assembly.GetExecutingAssembly().Location; + var dllFileInfo = new FileInfo(thisProjectDllPath); + + // move up from 'Test\ProjectDir\Bin\Debug\' to 'Test\' + var testFolderInfo = dllFileInfo.Directory.Parent.Parent.Parent; + + TestFolderPath = TestUtils.FirstCharToUpper(testFolderInfo.FullName); SampleSpecsSourcePath = Path.Combine(TestFolderPath, @"Samples\SampleSpecs\desc_SystemUnderTest.cs"); SampleSpecsDllPath = Path.Combine(TestFolderPath, @"Samples\SampleSpecs\bin\Debug\SampleSpecs.dll"); diff --git a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/packages.config b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/packages.config index 71822a5..109bc9a 100644 --- a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/packages.config +++ b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.IntegrationTests/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/NSpec.VsAdapter.UnitTests.csproj b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/NSpec.VsAdapter.UnitTests.csproj index 322fdf9..064ec8a 100644 --- a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/NSpec.VsAdapter.UnitTests.csproj +++ b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/NSpec.VsAdapter.UnitTests.csproj @@ -39,16 +39,16 @@ ..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll True - - ..\..\packages\AutofacContrib.NSubstitute.3.3.6\lib\NET40\AutofacContrib.NSubstitute.dll + + ..\..\packages\AutofacContrib.NSubstitute.3.3.7\lib\NET40\AutofacContrib.NSubstitute.dll True - - ..\..\packages\FluentAssertions.4.9.0\lib\net45\FluentAssertions.dll + + ..\..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.dll True - - ..\..\packages\FluentAssertions.4.9.0\lib\net45\FluentAssertions.Core.dll + + ..\..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.Core.dll True @@ -63,20 +63,20 @@ C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Interfaces.dll - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\..\packages\nspec.1.0.5\lib\NSpec.dll + + ..\..\packages\nspec.1.0.7\lib\NSpec.dll True ..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll True - - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + ..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll True diff --git a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/TestExplorer/NSpecTestContainer_desc.cs b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/TestExplorer/NSpecTestContainer_desc.cs index bb86100..dc9d14b 100644 --- a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/TestExplorer/NSpecTestContainer_desc.cs +++ b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/TestExplorer/NSpecTestContainer_desc.cs @@ -95,38 +95,53 @@ public void it_should_not_be_a_win8_metro_test_container() } [Test] - [ExpectedException] public void it_should_throw_with_null_container_discoverer() { - new NSpecTestContainer(null, sourcePath, debugEngines, fileService); + Assert.That(() => + { + new NSpecTestContainer(null, sourcePath, debugEngines, fileService); + + }, Throws.Exception); } [Test] - [ExpectedException] public void it_should_throw_with_null_source() { - new NSpecTestContainer(containerDiscoverer, null, debugEngines, fileService); + Assert.That(() => + { + new NSpecTestContainer(containerDiscoverer, null, debugEngines, fileService); + + }, Throws.Exception); } [Test] - [ExpectedException] public void it_should_throw_with_empty_source() { - new NSpecTestContainer(containerDiscoverer, String.Empty, debugEngines, fileService); + Assert.That(() => + { + new NSpecTestContainer(containerDiscoverer, String.Empty, debugEngines, fileService); + + }, Throws.Exception); } [Test] - [ExpectedException] public void it_should_throw_with_null_engines() { - new NSpecTestContainer(containerDiscoverer, sourcePath, null, fileService); + Assert.That(() => + { + new NSpecTestContainer(containerDiscoverer, sourcePath, null, fileService); + + }, Throws.Exception); } [Test] - [ExpectedException] public void it_should_throw_with_null_fileservice() { - new NSpecTestContainer(containerDiscoverer, sourcePath, debugEngines, null); + Assert.That(() => + { + new NSpecTestContainer(containerDiscoverer, sourcePath, debugEngines, null); + + }, Throws.Exception); } } diff --git a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/packages.config b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/packages.config index 115b1c5..3ec85da 100644 --- a/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/packages.config +++ b/src/NSpec.VsAdapter/Test/NSpec.VsAdapter.UnitTests/packages.config @@ -1,12 +1,12 @@  - - - - + + + + - + diff --git a/src/NSpec.VsAdapter/Test/Samples/AdHocConsoleRunner/AdHocConsoleRunner.csproj b/src/NSpec.VsAdapter/Test/Samples/AdHocConsoleRunner/AdHocConsoleRunner.csproj index 12b3a9f..b359f89 100644 --- a/src/NSpec.VsAdapter/Test/Samples/AdHocConsoleRunner/AdHocConsoleRunner.csproj +++ b/src/NSpec.VsAdapter/Test/Samples/AdHocConsoleRunner/AdHocConsoleRunner.csproj @@ -35,8 +35,8 @@ false - - ..\..\..\packages\nspec.1.0.5\lib\NSpec.dll + + ..\..\..\packages\nspec.1.0.7\lib\NSpec.dll True diff --git a/src/NSpec.VsAdapter/Test/Samples/AdHocConsoleRunner/packages.config b/src/NSpec.VsAdapter/Test/Samples/AdHocConsoleRunner/packages.config index f969a3b..0c643e5 100644 --- a/src/NSpec.VsAdapter/Test/Samples/AdHocConsoleRunner/packages.config +++ b/src/NSpec.VsAdapter/Test/Samples/AdHocConsoleRunner/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/NSpec.VsAdapter/Test/Samples/ConfigSampleSpecs/ConfigSampleSpecs.csproj b/src/NSpec.VsAdapter/Test/Samples/ConfigSampleSpecs/ConfigSampleSpecs.csproj index e7c8fa4..cb8afb6 100644 --- a/src/NSpec.VsAdapter/Test/Samples/ConfigSampleSpecs/ConfigSampleSpecs.csproj +++ b/src/NSpec.VsAdapter/Test/Samples/ConfigSampleSpecs/ConfigSampleSpecs.csproj @@ -38,12 +38,12 @@ false - - ..\..\..\packages\nspec.1.0.5\lib\NSpec.dll + + ..\..\..\packages\nspec.1.0.7\lib\NSpec.dll True - - ..\..\..\packages\Shouldly.2.8.0\lib\net40\Shouldly.dll + + ..\..\..\packages\Shouldly.2.8.1\lib\net40\Shouldly.dll True diff --git a/src/NSpec.VsAdapter/Test/Samples/ConfigSampleSpecs/packages.config b/src/NSpec.VsAdapter/Test/Samples/ConfigSampleSpecs/packages.config index 852d93c..1b17c61 100644 --- a/src/NSpec.VsAdapter/Test/Samples/ConfigSampleSpecs/packages.config +++ b/src/NSpec.VsAdapter/Test/Samples/ConfigSampleSpecs/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/NSpec.VsAdapter/Test/Samples/SampleAsyncSpecs/SampleAsyncSpecs.csproj b/src/NSpec.VsAdapter/Test/Samples/SampleAsyncSpecs/SampleAsyncSpecs.csproj index 8fff005..50690cb 100644 --- a/src/NSpec.VsAdapter/Test/Samples/SampleAsyncSpecs/SampleAsyncSpecs.csproj +++ b/src/NSpec.VsAdapter/Test/Samples/SampleAsyncSpecs/SampleAsyncSpecs.csproj @@ -35,12 +35,12 @@ 4 - - ..\..\..\packages\nspec.1.0.5\lib\NSpec.dll + + ..\..\..\packages\nspec.1.0.7\lib\NSpec.dll True - - ..\..\..\packages\Shouldly.2.8.0\lib\net40\Shouldly.dll + + ..\..\..\packages\Shouldly.2.8.1\lib\net40\Shouldly.dll True diff --git a/src/NSpec.VsAdapter/Test/Samples/SampleAsyncSpecs/packages.config b/src/NSpec.VsAdapter/Test/Samples/SampleAsyncSpecs/packages.config index 852d93c..1b17c61 100644 --- a/src/NSpec.VsAdapter/Test/Samples/SampleAsyncSpecs/packages.config +++ b/src/NSpec.VsAdapter/Test/Samples/SampleAsyncSpecs/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/NSpec.VsAdapter/Test/Samples/SampleSpecs/SampleSpecs.csproj b/src/NSpec.VsAdapter/Test/Samples/SampleSpecs/SampleSpecs.csproj index 5d97f65..d21edbe 100644 --- a/src/NSpec.VsAdapter/Test/Samples/SampleSpecs/SampleSpecs.csproj +++ b/src/NSpec.VsAdapter/Test/Samples/SampleSpecs/SampleSpecs.csproj @@ -35,12 +35,12 @@ 4 - - ..\..\..\packages\nspec.1.0.5\lib\NSpec.dll + + ..\..\..\packages\nspec.1.0.7\lib\NSpec.dll True - - ..\..\..\packages\Shouldly.2.8.0\lib\net40\Shouldly.dll + + ..\..\..\packages\Shouldly.2.8.1\lib\net40\Shouldly.dll True diff --git a/src/NSpec.VsAdapter/Test/Samples/SampleSpecs/packages.config b/src/NSpec.VsAdapter/Test/Samples/SampleSpecs/packages.config index 852d93c..1b17c61 100644 --- a/src/NSpec.VsAdapter/Test/Samples/SampleSpecs/packages.config +++ b/src/NSpec.VsAdapter/Test/Samples/SampleSpecs/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file