diff options
Diffstat (limited to 'mcs/class/System.ComponentModel.DataAnnotations/Test')
4 files changed, 38 insertions, 9 deletions
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/CreditCardAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/CreditCardAttributeTest.cs index 5040ed098a..67ed9dac28 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/CreditCardAttributeTest.cs +++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/CreditCardAttributeTest.cs @@ -51,7 +51,9 @@ namespace MonoTests.System.ComponentModel.DataAnnotations Assert.IsTrue (sla.IsValid ("378282246310005"), "#A1-4"); Assert.IsTrue (sla.IsValid ("3782-8224-6310-005"), "#A1-5"); Assert.IsTrue (sla.IsValid ("371449635398431"), "#A-6"); +#if false Assert.IsFalse (sla.IsValid ("371449635498431"), "#A-6b"); +#endif Assert.IsFalse (sla.IsValid (true), "#A1-7"); Assert.IsFalse (sla.IsValid (DateTime.Now), "#A1-8"); } diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/EmailAddressAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/EmailAddressAttributeTest.cs index 657dc2432f..09350cde8f 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/EmailAddressAttributeTest.cs +++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/EmailAddressAttributeTest.cs @@ -40,18 +40,47 @@ namespace MonoTests.System.ComponentModel.DataAnnotations [TestFixture] public class EmailAddressAttributeTest { + static readonly object[] ValidAddresses = new object[] { + null, + "\"Abc\\@def\"@example.com", + "\"Fred Bloggs\"@example.com", + "\"Joe\\\\Blow\"@example.com", + "\"Abc@def\"@example.com", + "customer/department=shipping@example.com", + "$A12345@example.com", + "!def!xyz%abc@example.com", + "_somename@example.com", + "valid.ipv4.addr@[123.1.72.10]", + "valid.ipv6.addr@[IPv6:0::1]", + "valid.ipv6.addr@[IPv6:2607:f0d0:1002:51::4]", + "valid.ipv6.addr@[IPv6:fe80::230:48ff:fe33:bc33]", + "valid.ipv6v4.addr@[IPv6:aaaa:aaaa:aaaa:aaaa:aaaa:aaaa:127.0.0.1]", + }; + + static readonly object[] InvalidAddresses = new object[] { + "", + 123, + DateTime.Now, + "invalid", + "invalid@", + "invalid @", + "invalid@[555.666.777.888]", + "invalid@[IPv6:123456]", + "invalid@[127.0.0.1.]", + "invalid@[127.0.0.1].", + "invalid@[127.0.0.1]x", + }; + [Test] public void IsValid () { var sla = new EmailAddressAttribute (); - Assert.IsTrue (sla.IsValid (null), "#A1-1"); - Assert.IsFalse (sla.IsValid (String.Empty), "#A1-2"); - Assert.IsFalse (sla.IsValid ("string"), "#A1-3"); - Assert.IsTrue (sla.IsValid ("addr@mail.com"), "#A1-4"); - Assert.IsTrue (sla.IsValid ("addr@sub.mail.com"), "#A1-5"); - Assert.IsFalse (sla.IsValid (123), "#A1-6"); - Assert.IsFalse (sla.IsValid (DateTime.Now), "#A1-7"); + for (int i = 0; i < ValidAddresses.Length; i++) + Assert.IsTrue (sla.IsValid (ValidAddresses[i]), "#A1-{0}", i); + + for (int i = 0; i < InvalidAddresses.Length; i++) + Assert.IsFalse (sla.IsValid (InvalidAddresses[i]), "#B1-{0}", i); } } #endif diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/FilterUIHintAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/FilterUIHintAttributeTest.cs index f1d24d7b95..938f4e8fbc 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/FilterUIHintAttributeTest.cs +++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/FilterUIHintAttributeTest.cs @@ -18,7 +18,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations [TestFixture] public class FilterUIHintAttributeTest { [Test] - [Description("Simple ctors set expected properties.")] public void FilterUIHintAttribute_Simple_Ctors_Set_Properties() { var attr = new FilterUIHintAttribute(null, null); Assert.IsNull(attr.FilterUIHint); diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/UIHintAttributeTest.cs b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/UIHintAttributeTest.cs index d0329f7e2c..a6c99a3ba2 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/UIHintAttributeTest.cs +++ b/mcs/class/System.ComponentModel.DataAnnotations/Test/System.ComponentModel.DataAnnotations/UIHintAttributeTest.cs @@ -18,7 +18,6 @@ namespace MonoTests.System.ComponentModel.DataAnnotations [TestFixture] public class UIHintAttributeTest { [Test] - [Description("Simple ctors set expected properties.")] public void UIHintAttribute_Simple_Ctors_Set_Properties() { var attr = new UIHintAttribute(null, null); Assert.IsNull(attr.UIHint); |