Skip to content

Commit bfe5eab

Browse files
committed
Fix WP-SL tests.
1 parent 1e64219 commit bfe5eab

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

test/MsgPack.UnitTest/MessagePackStringTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ public void TestToString_EmptyString()
136136
Assert.AreEqual( String.Empty, target.ToString() );
137137
}
138138

139+
#if !UNITY && !WINDOWS_PHONE
139140
[Test]
140141
public void TestEqualsFullTrust()
141142
{
@@ -153,6 +154,8 @@ private void ShowResult( Tuple<double, double, double, double> result )
153154
Console.WriteLine( "Large(100,000 chars) : {0:#,0.0} usec", result.Item4 );
154155
}
155156

157+
#endif // !UNITY && !WINDOWS_PHONE
158+
156159
#if !NETFX_CORE && !WINDOWS_PHONE && !XAMIOS && !XAMDROID && !UNITY
157160
private static StrongName GetStrongName( Type type )
158161
{

test/MsgPack.UnitTest/PackUnpackTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ private static void TestBoolean( bool val )
9999
Assert.IsTrue( obj.IsTypeOf<bool>().GetValueOrDefault() );
100100
}
101101

102+
#if !WINDOWS_PHONE
102103
[Test]
103104
public void TestStringShort()
104105
{
@@ -129,6 +130,7 @@ public void TestStringShort()
129130
sw.Stop();
130131
Console.WriteLine( "Small String ({1:#,###.0}): {0:0.###} msec/object", sw.ElapsedMilliseconds / 100.0, avg );
131132
}
133+
#endif // !WINDOWS_PHONE
132134

133135
[Test]
134136
[Timeout( 3000000 )]

test/MsgPack.UnitTest/Serialization/SerializationTargetTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class SerializationTargetTest
5454
private const string PublicFieldPlain = "PublicFieldPlain";
5555
private const string PublicReadOnlyFieldPlain = "PublicReadOnlyFieldPlain";
5656
private const string NonPublicFieldPlain = "NonPublicFieldPlain";
57-
#if !NETFX_CORE
57+
#if !NETFX_CORE && !WINDOWS_PHONE
5858
private const string NonSerializedPublicField = "NonSerializedPublicField";
5959
private const string NonSerializedPublicReadOnlyField = "NonSerializedPublicReadOnlyField";
6060
private const string NonSerializedNonPublicField = "NonSerializedNonPublicField";
@@ -76,7 +76,7 @@ public void TestAnnotated()
7676
{
7777
TestCore<AnnotatedClass>(
7878
PublicProperty, NonPublicProperty, PublicField, NonPublicField,
79-
#if !NETFX_CORE
79+
#if !NETFX_CORE && !WINDOWS_PHONE
8080
NonSerializedPublicField, NonSerializedNonPublicField,
8181
#endif
8282
CollectionReadOnlyProperty );
@@ -87,8 +87,8 @@ public void TestDataMember()
8787
{
8888
// includes issue33
8989
TestCore<DataMamberClass>(
90-
PublicProperty, NonPublicProperty, PublicField, NonPublicField,
91-
#if !NETFX_CORE
90+
PublicProperty, NonPublicProperty, PublicField, NonPublicField,
91+
#if !NETFX_CORE && !WINDOWS_PHONE
9292
NonSerializedPublicField, NonSerializedNonPublicField,
9393
#endif
9494
CollectionReadOnlyProperty );

test/MsgPack.UnitTest/TestSuite.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
namespace MsgPack
3939
{
40-
#if !NETFX_CORE
40+
#if !NETFX_CORE && !WINDOWS_PHONE
4141
[TestFixture]
4242
public class TestSuite
4343
{

0 commit comments

Comments
 (0)