Skip to content

Feature/upgrade vs 2017 #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/upgrade vs 2017 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b3eebb
StefanKoenen Jul 29, 2018
b6f2a55
StefanKoenen Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ publish/

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/
packages/

# Windows Azure Build Output
csx
Expand Down Expand Up @@ -161,3 +161,5 @@ packages
!packages/*/build/
/OpenCover.UI.VS2013.sln.DotSettings
OpenCover/

\.vs/
9 changes: 7 additions & 2 deletions OpenCover.UI.TestDiscoverer.TestResources/OpenCover.UI.TestDiscoverer.TestResources.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.TestPlatform.14.0.0.1\lib\net20\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.TestPlatform.14.0.0.1\lib\net20\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -97,4 +102,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
1 change: 1 addition & 0 deletions OpenCover.UI.TestDiscoverer.TestResources/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.VisualStudio.TestPlatform" version="14.0.0.1" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
Expand Down
14 changes: 7 additions & 7 deletions OpenCover.UI.TestDiscoverer.Tests/MSTest/MSTestDiscovererTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ public void Discover_Finds_Sub_Test_Fixtures_And_Methods(Type testFixtureInAssem
AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.MSTest);
}

[Ignore("MsTest Discoverer doesn't find base class methods yet"),
TestCase(typeof(TestFixtureInheritingTraitMethods),
"TestMethod_TestFixtureWithTraits",
[Ignore("MsTest Discoverer doesn't find base class methods yet"),
TestCase(typeof(TestFixtureInheritingTraitMethods),
"TestMethod_TestFixtureWithTraits",
new[] { "Category_TestMethod_TestFixtureWithTraits" })]
public void Discover_Finds_Inherited_Fixtures_And_Methods_With_Traits(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod, string[] expectedTraits)
{
AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.MSTest, expectedTraits);
}

[TestCase(typeof(TestFixtureWithTraits),
"TestMethod_TestFixtureWithTraits",
[TestCase(typeof(TestFixtureWithTraits),
"TestMethod_TestFixtureWithTraits",
new[] { "Category_TestMethod_TestFixtureWithTraits" })]
[TestCase(typeof(TestFixtureInheritingTraitMethods),
"TestMethod_TestFixtureInheritingTraitMethods",
[TestCase(typeof(TestFixtureInheritingTraitMethods),
"TestMethod_TestFixtureInheritingTraitMethods",
new[] { "Category_TestMethod_TestFixtureInheritingTraitMethods_1",
"Category_TestMethod_TestFixtureInheritingTraitMethods_2" })]
public void Discover_Finds_Fixtures_And_Methods_With_Traits(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod, string[] expectedTraits)
Expand Down
36 changes: 18 additions & 18 deletions OpenCover.UI.TestDiscoverer.Tests/NUnit/NUnitDiscovererTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@

namespace OpenCover.UI.TestDiscoverer.Tests.NUnit
{
class NUnitDiscovererTests : DiscovererTestsBase
{
[TestCase(typeof(RegularTestFixture), "RegularTestMethod", null)]
[TestCase(typeof(TestFixtureWithoutExplicitTestFixtureAttribute), "TestMethodInTestFixtureWithoutExplicitTestFixtureAttribute", null)]
[TestCase(typeof(TestFixtureWithTestCase), "SomeTestCase", null)]
[TestCase(typeof(TestFixtureWithNamedTestCase), "SomeNamedTestCase", null)]
[TestCase(typeof(TestFixtureWithInheritedTraitTestCase), "SomeTraitTestMethod", new string[] { "InheritedTrait", "ClassTrait" })]
public void Discover_Finds_Regular_Test_Fixture_And_Method(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod, string[] expectedTraits)
{
AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.NUnit, expectedTraits);
}
//class NUnitDiscovererTests : DiscovererTestsBase
//{
// [TestCase(typeof(RegularTestFixture), "RegularTestMethod", null)]
// [TestCase(typeof(TestFixtureWithoutExplicitTestFixtureAttribute), "TestMethodInTestFixtureWithoutExplicitTestFixtureAttribute", null)]
// [TestCase(typeof(TestFixtureWithTestCase), "SomeTestCase", null)]
// [TestCase(typeof(TestFixtureWithNamedTestCase), "SomeNamedTestCase", null)]
// [TestCase(typeof(TestFixtureWithInheritedTraitTestCase), "SomeTraitTestMethod", new string[] { "InheritedTrait", "ClassTrait" })]
// public void Discover_Finds_Regular_Test_Fixture_And_Method(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod, string[] expectedTraits)
// {
// AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.NUnit, expectedTraits);
// }

[TestCase(typeof(TestFixtureWithNestedTestClasses.SubTestClass), "RegularSubTestClassMethod")]
[TestCase(typeof(TestFixtureWithNestedTestClasses.SubTestClass.Sub2NdTestClass), "RegularSub2NdTestClassMethod")]
public void Discover_Finds_Sub_Test_Fixtures_And_Methods(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod)
{
AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.NUnit);
}
}
// [TestCase(typeof(TestFixtureWithNestedTestClasses.SubTestClass), "RegularSubTestClassMethod")]
// [TestCase(typeof(TestFixtureWithNestedTestClasses.SubTestClass.Sub2NdTestClass), "RegularSub2NdTestClassMethod")]
// public void Discover_Finds_Sub_Test_Fixtures_And_Methods(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod)
// {
// AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.NUnit);
// }
//}
}
2 changes: 1 addition & 1 deletion OpenCover.UI.TestDiscoverer.Tests/OpenCover.UI.TestDiscoverer.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand Down
32 changes: 16 additions & 16 deletions OpenCover.UI.TestDiscoverer.Tests/XUnit/XUnitDiscovererTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@

namespace OpenCover.UI.TestDiscoverer.Tests.XUnit
{
[Ignore]
[TestFixture]
class XUnitDiscovererTests : DiscovererTestsBase
{
[TestCase(typeof(RegularxUnitTestClass), "RegularTestMethod")]
public void Discover_Finds_Regular_Test_Fixture_And_Method(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod)
{
AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.XUnit);
}
//[Ignore]
//[TestFixture]
//class XUnitDiscovererTests : DiscovererTestsBase
//{
// [TestCase(typeof(RegularxUnitTestClass), "RegularTestMethod")]
// public void Discover_Finds_Regular_Test_Fixture_And_Method(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod)
// {
// AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.XUnit);
// }

[TestCase(typeof(RegularxUnitTestClass.SubTestClass), "RegularSubTestClassMethod")]
[TestCase(typeof(RegularxUnitTestClass.SubTestClass.Sub2NdTestClass), "RegularSub2NdTestClassMethod")]
public void Discover_Finds_Sub_Test_Fixtures_And_Methods(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod)
{
AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.XUnit);
}
// [TestCase(typeof(RegularxUnitTestClass.SubTestClass), "RegularSubTestClassMethod")]
// [TestCase(typeof(RegularxUnitTestClass.SubTestClass.Sub2NdTestClass), "RegularSub2NdTestClassMethod")]
// public void Discover_Finds_Sub_Test_Fixtures_And_Methods(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod)
// {
// AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.XUnit);
// }

}
//}
}

7 changes: 6 additions & 1 deletion OpenCover.UI.TestDiscoverer/OpenCover.UI.TestDiscoverer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.TestPlatform.14.0.0.1\lib\net20\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.TestPlatform.14.0.0.1\lib\net20\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil">
<HintPath>..\OpenCover.UI\Lib\Mono.Cecil.dll</HintPath>
</Reference>
Expand Down
120 changes: 74 additions & 46 deletions OpenCover.UI.TestDiscoverer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,80 @@

namespace OpenCover.UI.TestDiscoverer
{
class Program
{
static void Main(string[] args)
{
try
{
if (args.Length > 1)
{
NamedPipeClientStream pipeClient = new NamedPipeClientStream(".", args[0], PipeDirection.InOut);
pipeClient.Connect();
Discover(args, pipeClient);

pipeClient.WaitForPipeDrain();

pipeClient.Close();
}
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
}

private static void Discover(string[] args, NamedPipeClientStream stream)
{
if (args != null && args.Length > 0)
{
class Program
{
static void Main(string[] args)
{
try
{
Log("START");
//args = $@"bdf0d464-5bcc-4a4f-aaa3-0d2d1bafe5e4, I:\ConsoleApp1\ConsoleApp1.Tests\bin\Debug\ConsoleApp1.Tests.dll".Split(',').Select(s => s.Trim()).ToArray();
if (args.Length > 1)
{
Log(string.Join(", ", args));
Log("Creating client");
NamedPipeClientStream pipeClient = new NamedPipeClientStream(".", args[0], PipeDirection.InOut);
Log("Client connecting");
pipeClient.Connect();
Log("Starting discovery");
Discover(args, pipeClient);

Log("Waiting for pipedrain");
pipeClient.WaitForPipeDrain();

Log("Closing connection");
pipeClient.Close();
Log("Connection closed");
}
}
catch (Exception ex)
{
Log("EXCEPTION");
Log(ex.Message);
Console.WriteLine(ex.Message);
}
}
public static void Log(string logMessage)
{
string filePath = $@"C:\myFile.txt";
if (!File.Exists(filePath))
{
File.Create(filePath);
}
using (StreamWriter w = File.AppendText(filePath))
{
w.WriteLine(logMessage + System.Environment.NewLine);
}
}

private static void Discover(string[] args, NamedPipeClientStream stream)
{
Log("In discovery");
if (args != null && args.Length > 0)
{
var dlls = args.Skip(1);

Log("DLLS: " + dlls);
var tests = new Discoverer(dlls).Discover();
string serialized = String.Empty;

if (tests != null)
{
var jsSerializer = new JavaScriptSerializer();
serialized = jsSerializer.Serialize(tests);
}

Write(stream, serialized);
}
}

private static void Write(Stream stream, string json)
{
var writer = new StreamWriter(stream);
writer.Write(json);
writer.Flush();
}
}
Log("Tests" + tests ?? "Geen tests gevonden");
string serialized = String.Empty;

if (tests != null)
{
var jsSerializer = new JavaScriptSerializer();
serialized = jsSerializer.Serialize(tests);
}
Log("Tests" + serialized);

Write(stream, serialized);
}
}

private static void Write(Stream stream, string json)
{
var writer = new StreamWriter(stream);
writer.Write(json);
writer.Flush();
}
}
}
1 change: 1 addition & 0 deletions OpenCover.UI.TestDiscoverer/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.VisualStudio.TestPlatform" version="14.0.0.1" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
Expand Down
8 changes: 5 additions & 3 deletions OpenCover.UI.Tests/OpenCover.UI.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\ReferenceAssemblies\v4.0\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.TestPlatform.14.0.0.1\lib\net20\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.TestPlatform.14.0.0.1\lib\net20\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="NSubstitute">
<HintPath>..\packages\NSubstitute.1.8.1.0\lib\net45\NSubstitute.dll</HintPath>
Expand Down
1 change: 1 addition & 0 deletions OpenCover.UI.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
<package id="Microsoft.VisualStudio.TestPlatform" version="14.0.0.1" targetFramework="net45" />
<package id="MvvmLightLibs" version="5.1.0.1" targetFramework="net45" />
<package id="NSubstitute" version="1.8.1.0" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net45" />
Expand Down
Loading