Skip to content

Commit c3d6f36

Browse files
zenginzengin
committed
move to NUnit for independent test runs
1 parent c2d50fb commit c3d6f36

10 files changed

+48
-24
lines changed

‎src/GraphODataTemplateWriter/Settings/ConfigurationService.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,7 @@ public static TemplateWriterSettings Settings
106106
{
107107
get
108108
{
109-
// settings are considered new if
110-
// 1. templateWriterSettings are not initialized
111-
// 2. targetLanguage or properties are different between templateWriterSettings and ConfigurationService
112-
if (templateWriterSettings == null
113-
|| templateWriterSettings.TargetLanguage != ConfigurationService.targetLanguage
114-
|| (templateWriterSettings.Properties == null ^ ConfigurationService.properties == null) // when only one of them is null, they are different
115-
|| (templateWriterSettings.Properties != null && templateWriterSettings.Properties.SequenceEqual(ConfigurationService.properties)))
109+
if (templateWriterSettings == null || templateWriterSettings.TargetLanguage != ConfigurationService.targetLanguage)
116110
{
117111
templateWriterSettings = _configurationProvider != null
118112
? LoadSettingsForLanguage()

‎test/Typewriter.Test/CSharpMultipleNamespacesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22

33
namespace Typewriter.Test
44
{
5-
[TestClass]
5+
[TestFixture]
66
public class CSharpMultipleNamespacesTests
77
{
8-
[TestMethod]
8+
[Test]
99
public void Test()
1010
{
1111
MultipleNamespacesTestRunner.Run(TestLanguage.CSharp);

‎test/Typewriter.Test/JavaMultipleNamespacesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22

33
namespace Typewriter.Test
44
{
5-
[TestClass]
5+
[TestFixture]
66
public class JavaMultipleNamespacesTests
77
{
8-
[TestMethod]
8+
[Test]
99
public void Test()
1010
{
1111
MultipleNamespacesTestRunner.Run(TestLanguage.Java);

‎test/Typewriter.Test/MultipleNamespacesTestRunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ string getMetadataFile(TestLanguage testLanguage)
5858
var outputDirectoryName = OutputDirectoryPrefix + directoryPostfix;
5959
var testDataDirectoryName = TestDataDirectoryPrefix + directoryPostfix;
6060

61-
var currentDirectory = Directory.GetCurrentDirectory();
61+
var currentDirectory = Path.GetDirectoryName(typeof(MultipleNamespacesTestRunner).Assembly.Location); //Directory.GetCurrentDirectory();
6262
var outputDirectory = Path.Combine(currentDirectory, outputDirectoryName);
6363
var dataDirectory = Path.Combine(currentDirectory, testDataDirectoryName);
6464
var metadataFile = Path.Combine(currentDirectory, MetadataDirectoryName, getMetadataFile(language));

‎test/Typewriter.Test/ObjCMultipeNamespacesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22

33
namespace Typewriter.Test
44
{
5-
[TestClass]
5+
[TestFixture]
66
public class ObjCMultipeNamespacesTests
77
{
8-
[TestMethod]
8+
[Test, RunInApplicationDomain]
99
public void Test()
1010
{
1111
MultipleNamespacesTestRunner.Run(TestLanguage.ObjC);

‎test/Typewriter.Test/PHPMultipleNamespacesTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22

33
namespace Typewriter.Test
44
{
5-
[TestClass]
5+
[TestFixture]
66
public class PHPMultipleNamespacesTests
77
{
8-
[TestMethod]
8+
[Test, RunInApplicationDomain]
99
public void Test()
1010
{
1111
MultipleNamespacesTestRunner.Run(TestLanguage.PHP);
1212
}
1313

14-
[TestMethod]
14+
[Test, RunInApplicationDomain]
1515
public void TestBeta()
1616
{
1717
MultipleNamespacesTestRunner.Run(TestLanguage.PHP, isPhpBeta: true);

‎test/Typewriter.Test/TypeScriptMultipeNamespacesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
using NUnit.Framework;
22

33
namespace Typewriter.Test
44
{
5-
[TestClass]
5+
[TestFixture]
66
public class TypeScriptMultipeNamespacesTests
77
{
8-
[TestMethod]
8+
[Test]
99
public void Test()
1010
{
1111
MultipleNamespacesTestRunner.Run(TestLanguage.TypeScript);

‎test/Typewriter.Test/Typewriter.Test.csproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" />
4+
<Import Project="..\..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.12.0\build\NUnit.props')" />
35
<Import Project="..\..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" />
46
<PropertyGroup>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -44,6 +46,12 @@
4446
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
4547
<HintPath>..\..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
4648
</Reference>
49+
<Reference Include="NUnit.ApplicationDomain, Version=11.0.0.0, Culture=neutral, PublicKeyToken=afbd8211e0c40e2c, processorArchitecture=MSIL">
50+
<HintPath>..\..\packages\NUnit.ApplicationDomain.11.1.0\lib\net40\NUnit.ApplicationDomain.dll</HintPath>
51+
</Reference>
52+
<Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
53+
<HintPath>..\..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
54+
</Reference>
4755
<Reference Include="System" />
4856
<Reference Include="System.Core" />
4957
<Reference Include="System.Xml.Linq" />
@@ -89,6 +97,7 @@
8997
<Compile Include="Given_a_valid_metadata_file_to_Typewriter.cs" />
9098
</ItemGroup>
9199
<ItemGroup>
100+
<None Include="app.config" />
92101
<None Include="packages.config" />
93102
</ItemGroup>
94103
<ItemGroup>
@@ -110,4 +119,11 @@
110119
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
111120
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
112121
<Import Project="..\..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" />
122+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
123+
<PropertyGroup>
124+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
125+
</PropertyGroup>
126+
<Error Condition="!Exists('..\..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.12.0\build\NUnit.props'))" />
127+
<Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props'))" />
128+
</Target>
113129
</Project>

‎test/Typewriter.Test/app.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-3.12.0.0" newVersion="3.12.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎test/Typewriter.Test/packages.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
<packages>
33
<package id="MSTest.TestAdapter" version="1.2.1" targetFramework="net472" />
44
<package id="MSTest.TestFramework" version="1.2.1" targetFramework="net472" />
5+
<package id="NUnit" version="3.12.0" targetFramework="net472" />
6+
<package id="NUnit.ApplicationDomain" version="11.1.0" targetFramework="net472" />
7+
<package id="NUnit3TestAdapter" version="3.17.0" targetFramework="net472" />
58
</packages>

0 commit comments

Comments
 (0)