Skip to content

Commit 289e80c

Browse files
committed
Fix test code bug for Silverlight FullTrust tests.
1 parent e5db540 commit 289e80c

7 files changed

+14
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,13 +2536,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
25362536
stream.Write( new byte[]{ 0x90 } );
25372537
stream.Position = 0;
25382538
var result = serializer.Unpack( stream );
2539-
#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2539+
#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25402540
// Default constructor was called and was nothing to be set.
25412541
Assert.That( result.Member, Is.EqualTo( "ABC" ) );
25422542
#else
25432543
// Set null via deserialization constructor.
25442544
Assert.That( result.Member, Is.Null );
2545-
#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2545+
#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25462546
}
25472547
}
25482548

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2561,13 +2561,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
25612561
stream.Write( new byte[]{ 0x80 } );
25622562
stream.Position = 0;
25632563
var result = serializer.Unpack( stream );
2564-
#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2564+
#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25652565
// Default constructor was called and was nothing to be set.
25662566
Assert.That( result.Member, Is.EqualTo( "ABC" ) );
25672567
#else
25682568
// Set null via deserialization constructor.
25692569
Assert.That( result.Member, Is.Null );
2570-
#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2570+
#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25712571
}
25722572
}
25732573

test/MsgPack.UnitTest/Serialization/ArrayFieldBasedAutoMessagePackSerializerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,13 +2536,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
25362536
stream.Write( new byte[]{ 0x90 } );
25372537
stream.Position = 0;
25382538
var result = serializer.Unpack( stream );
2539-
#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2539+
#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25402540
// Default constructor was called and was nothing to be set.
25412541
Assert.That( result.Member, Is.EqualTo( "ABC" ) );
25422542
#else
25432543
// Set null via deserialization constructor.
25442544
Assert.That( result.Member, Is.Null );
2545-
#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2545+
#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25462546
}
25472547
}
25482548

test/MsgPack.UnitTest/Serialization/ArrayReflectionBasedAutoMessagePackSerializerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,13 +2536,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
25362536
stream.Write( new byte[]{ 0x90 } );
25372537
stream.Position = 0;
25382538
var result = serializer.Unpack( stream );
2539-
#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2539+
#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25402540
// Default constructor was called and was nothing to be set.
25412541
Assert.That( result.Member, Is.EqualTo( "ABC" ) );
25422542
#else
25432543
// Set null via deserialization constructor.
25442544
Assert.That( result.Member, Is.Null );
2545-
#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2545+
#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25462546
}
25472547
}
25482548

test/MsgPack.UnitTest/Serialization/AutoMessagePackSerializerTest.ttinclude

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,13 +2147,13 @@ namespace MsgPack.Serialization
21472147
goto case "PublicSetter";
21482148
}
21492149
#>
2150-
#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2150+
#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
21512151
// Default constructor was called and was nothing to be set.
21522152
Assert.That( result.Member, Is.EqualTo( <#= type.DefaultValue #> ) );
21532153
#else
21542154
// Set null via deserialization constructor.
21552155
Assert.That( result.Member, Is.Null );
2156-
#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2156+
#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
21572157
<#+
21582158
break;
21592159
}

test/MsgPack.UnitTest/Serialization/MapFieldBasedAutoMessagePackSerializerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2561,13 +2561,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
25612561
stream.Write( new byte[]{ 0x80 } );
25622562
stream.Position = 0;
25632563
var result = serializer.Unpack( stream );
2564-
#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2564+
#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25652565
// Default constructor was called and was nothing to be set.
25662566
Assert.That( result.Member, Is.EqualTo( "ABC" ) );
25672567
#else
25682568
// Set null via deserialization constructor.
25692569
Assert.That( result.Member, Is.Null );
2570-
#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2570+
#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25712571
}
25722572
}
25732573

test/MsgPack.UnitTest/Serialization/MapReflectionBasedAutoMessagePackSerializerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2561,13 +2561,13 @@ public void TestHasPrivateSetterPropertyWithBothConstructor_DeserializeWithMissi
25612561
stream.Write( new byte[]{ 0x80 } );
25622562
stream.Position = 0;
25632563
var result = serializer.Unpack( stream );
2564-
#if !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2564+
#if !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25652565
// Default constructor was called and was nothing to be set.
25662566
Assert.That( result.Member, Is.EqualTo( "ABC" ) );
25672567
#else
25682568
// Set null via deserialization constructor.
25692569
Assert.That( result.Member, Is.Null );
2570-
#endif // !SILVERLIGHT && !SILVERLIGHT_PREVILEGED
2570+
#endif // !SILVERLIGHT || SILVERLIGHT_PRIVILEGED
25712571
}
25722572
}
25732573

0 commit comments

Comments
 (0)