Skip to content

Commit 53082f1

Browse files
committed
Fix UWP unit test error.
1 parent 839dc47 commit 53082f1

5 files changed

Lines changed: 3 additions & 35 deletions

File tree

test/MsgPack.UnitTest.CodeDom/Serialization/CodeDomBasedNilImplicationTest.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,7 @@ private MessagePackSerializer<T> CreateTarget<T>( SerializationContext context )
5858
}
5959
#if !SILVERLIGHT && !AOT && !UNITY
6060

61-
#if MSTEST
62-
[Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestInitialize]
63-
public void Initialize( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestContext c )
64-
{
65-
this.SetUp();
66-
}
67-
#else
6861
[SetUp]
69-
#endif
7062
public void SetUp()
7163
{
7264
#if !NETSTANDARD1_1 && !NETSTANDARD1_3

test/MsgPack.UnitTest/MessagePackStringTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void TestToString_EmptyString()
139139
Assert.AreEqual( String.Empty, target.ToString() );
140140
}
141141

142-
#if !UNITY && !SILVERLIGHT && !AOT
142+
#if !UNITY && !SILVERLIGHT && !AOT && !NETFX_CORE
143143
[Test]
144144
public void TestEqualsFullTrust()
145145
{
@@ -159,7 +159,7 @@ private void ShowResult( Tuple<double, double, double, double> result )
159159

160160
#endif // !UNITY && !SILVERLIGHT && !AOT
161161

162-
#if !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3
162+
#if !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETFX_CORE
163163
private static StrongName GetStrongName( Type type )
164164
{
165165
var assemblyName = type.Assembly.GetName();
@@ -241,7 +241,6 @@ public static void TestEqualsWorker()
241241
AppDomain.CurrentDomain.SetData( "TestEqualsWorker.Performance", result );
242242
AppDomain.CurrentDomain.SetData( "MessagePackString.IsFastEqualsDisabled", MessagePackString.IsFastEqualsDisabled );
243243
}
244-
#endif // !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3
245244

246245
private static Tuple<double, double, double, double> TestEqualsCore()
247246
{
@@ -369,5 +368,6 @@ private static Tuple<double, double, double, double> TestEqualsCore()
369368

370369
return Tuple.Create( tinyAvg, smallAvg, mediumAvg, largeAvg );
371370
}
371+
#endif // !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3
372372
}
373373
}

test/MsgPack.UnitTest/Serialization/FieldBasedNilImplicationTest.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,7 @@ private MessagePackSerializer<T> CreateTarget<T>( SerializationContext context )
5858
}
5959
#if !SILVERLIGHT && !AOT && !UNITY
6060

61-
#if MSTEST
62-
[Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestInitialize]
63-
public void Initialize( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestContext c )
64-
{
65-
this.SetUp();
66-
}
67-
#else
6861
[SetUp]
69-
#endif
7062
public void SetUp()
7163
{
7264
#if !NETSTANDARD1_1 && !NETSTANDARD1_3

test/MsgPack.UnitTest/Serialization/NilImplicationTest.ttinclude

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,7 @@ namespace MsgPack.Serialization
101101
#>
102102
#if !SILVERLIGHT && !AOT && !UNITY
103103

104-
#if MSTEST
105-
[Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestInitialize]
106-
public void Initialize( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestContext c )
107-
{
108-
this.SetUp();
109-
}
110-
#else
111104
[SetUp]
112-
#endif
113105
public void SetUp()
114106
{
115107
#if !NETSTANDARD1_1 && !NETSTANDARD1_3

test/MsgPack.UnitTest/Serialization/ReflectionBasedNilImplicationTest.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,7 @@ private MessagePackSerializer<T> CreateTarget<T>( SerializationContext context )
5858
}
5959
#if !SILVERLIGHT && !AOT && !UNITY
6060

61-
#if MSTEST
62-
[Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestInitialize]
63-
public void Initialize( Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestContext c )
64-
{
65-
this.SetUp();
66-
}
67-
#else
6861
[SetUp]
69-
#endif
7062
public void SetUp()
7163
{
7264
#if !NETSTANDARD1_1 && !NETSTANDARD1_3

0 commit comments

Comments
 (0)