Fix ConfigFileTests

build.cake

@@ -25,31 +25,31 @@ var DemoProjects = new DemoProject[] {
 	{
 		Path = VS2015_DIR + "CSharpTestDemo/CSharpTestDemo.csproj", 
 		OutputDir = VS2015_DIR + "CSharpTestDemo/bin/" + configuration + "/",
-		ExpectedResult = "Total tests: 107. Passed: 58. Failed: 25. Skipped: 15."
+		ExpectedResult = "Total tests: 107. Passed: 59. Failed: 24. Skipped: 15."
 	},
 	new DemoProject()
 	{
 		Path = VS2015_DIR + "VbTestDemo/VbTestDemo.vbproj", 
 		OutputDir = VS2015_DIR + "VbTestDemo/bin/" + configuration + "/",
-		ExpectedResult = "Total tests: 107. Passed: 58. Failed: 25. Skipped: 15."
+		ExpectedResult = "Total tests: 107. Passed: 59. Failed: 24. Skipped: 15."
 	},
 	new DemoProject()
 	{
 		Path = VS2015_DIR + "CppTestDemo/CppTestDemo.vcxproj",
 		OutputDir = VS2015_DIR + "CppTestDemo/" + configuration + "/",
-		ExpectedResult = "Total tests: 29. Passed: 13. Failed: 6. Skipped: 8."
+		ExpectedResult = "Total tests: 29. Passed: 14. Failed: 5. Skipped: 8."
 	},
 	new DemoProject()
 	{
-		Path = VS2017_DIR + "NUnitTestDemo/NUnit3TestDemo.csproj",
-		OutputDir = VS2017_DIR + "NUnitTestDemo/bin/" + configuration + "/",
-		ExpectedResult = "Total tests: 107. Passed: 58. Failed: 25. Skipped: 15."
+		Path = VS2017_DIR + "CSharpTestDemo/CSharpTestDemo.csproj",
+		OutputDir = VS2017_DIR + "CSharpTestDemo/bin/" + configuration + "/",
+		ExpectedResult = "Total tests: 107. Passed: 59. Failed: 24. Skipped: 15."
 	},
 	new DemoProject()
 	{
 		Path = VS2017_DIR + "NUnit3CoreTestDemo/NUnit3CoreTestDemo.csproj",
 		OutputDir = VS2017_DIR + "NUnit3CoreTestDemo/bin/" + configuration + "/",
-		ExpectedResult = "Total tests: 107. Passed: 58. Failed: 25. Skipped: 15."
+		ExpectedResult = "Total tests: 107. Passed: 59. Failed: 24. Skipped: 15."
 	}
 };
 

solutions/vs2017/CSharpTestDemo/CSharpTestDemo.csproj

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NUnitTestDemo</RootNamespace>
-    <AssemblyName>NUnit3TestDemo</AssemblyName>
+    <AssemblyName>CSharpTestDemo</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />

solutions/vs2017/CSharpTestDemo/CSharpTestDemo.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2003
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnit3TestDemo", "NUnit3TestDemo.csproj", "{03C3F9EC-FB25-46C0-8F0D-17A0C6E60E9F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpTestDemo", "CSharpTestDemo.csproj", "{03C3F9EC-FB25-46C0-8F0D-17A0C6E60E9F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/cpp/ConfigFileTests.cpp

@@ -14,8 +14,8 @@ namespace NUnitTestDemo
         [Test]
         static void ProperConfigFileIsUsed()
         {
-            String^ expectedPath = Path::Combine(TestContext::CurrentContext->TestDirectory, "NUnit3TestDemo.dll.config");
-            Assert::That(expectedPath, Is::EqualTo(AppDomain::CurrentDomain->SetupInformation->ConfigurationFile));
+            String^ expectedPath = Path::Combine(TestContext::CurrentContext->TestDirectory, "CppTestDemo.dll.config");
+            Assert::That(AppDomain::CurrentDomain->SetupInformation->ConfigurationFile, Is::EqualTo(expectedPath));
         }
 
         [Test]

src/csharp/ConfigFileTests.cs

@@ -11,8 +11,8 @@ namespace NUnitTestDemo
         [Test]
         public static void ProperConfigFileIsUsed()
         {
-            var expectedPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "NUnit3TestDemo.dll.config");
-            Assert.That(expectedPath, Is.EqualTo(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile));
+            var expectedPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "CSharpTestDemo.dll.config");
+            Assert.That(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile, Is.EqualTo(expectedPath));
         }
 
         [Test]

src/vb/ConfigFileTests.vb

@@ -8,8 +8,8 @@ Namespace NUnitTestDemo
     Public Class ConfigFileTests
         <Test>
         Public Shared Sub ProperConfigFileIsUsed()
-            Dim expectedPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "NUnit3TestDemo.dll.config")
-            Assert.That(expectedPath, Iz.EqualTo(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile))
+            Dim expectedPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "VbTestDemo.dll.config")
+            Assert.That(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile, Iz.EqualTo(expectedPath))
         End Sub
 
         <Test>