diff --git a/src/Radical.Tests/ChangeArgsTests.cs b/src/Radical.Tests/ChangeArgsTests.cs index bc826d8b..3350f069 100644 --- a/src/Radical.Tests/ChangeArgsTests.cs +++ b/src/Radical.Tests/ChangeArgsTests.cs @@ -26,25 +26,29 @@ public void changeArgs_generic_ctor_normal_should_correctly_set_values() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void changeArgs_ctor_using_null_reference_entity_should_raise_ArgumentNullException() { - object entity = null; - var cachedValue = new GenericParameterHelper(); - var iChange = A.Dummy(); - - var target = new ChangeEventArgs(entity, cachedValue, iChange); + Assert.ThrowsExactly(() => + { + object entity = null; + var cachedValue = new GenericParameterHelper(); + var iChange = A.Dummy(); + + var target = new ChangeEventArgs(entity, cachedValue, iChange); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void changeArgs_ctor_using_null_reference_iChange_should_raise_ArgumentNullException() { - var entity = new object(); - var cachedValue = new GenericParameterHelper(); - IChange iChange = null; - - var target = new ChangeEventArgs(entity, cachedValue, iChange); + Assert.ThrowsExactly(() => + { + var entity = new object(); + var cachedValue = new GenericParameterHelper(); + IChange iChange = null; + + var target = new ChangeEventArgs(entity, cachedValue, iChange); + }); } } } diff --git a/src/Radical.Tests/ChangeTracking/AdvisedActionTests.cs b/src/Radical.Tests/ChangeTracking/AdvisedActionTests.cs index 3bb6783b..76a92847 100644 --- a/src/Radical.Tests/ChangeTracking/AdvisedActionTests.cs +++ b/src/Radical.Tests/ChangeTracking/AdvisedActionTests.cs @@ -23,27 +23,33 @@ public void advisedAction_ctor() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void advisedAction_ctor_null_reference_target() { - AdvisedAction actual = new AdvisedAction(null, ProposedActions.Delete); + Assert.ThrowsExactly(() => + { + AdvisedAction actual = new AdvisedAction(null, ProposedActions.Delete); + }); } [TestMethod] - [ExpectedException(typeof(NotSupportedException))] [TestCategory("ChangeTracking")] public void advisedAction_ctor_not_supported_proposed_action() { - AdvisedAction actual = new AdvisedAction(new object(), ProposedActions.None); + Assert.ThrowsExactly(() => + { + AdvisedAction actual = new AdvisedAction(new object(), ProposedActions.None); + }); } [TestMethod] - [ExpectedException(typeof(EnumValueOutOfRangeException))] [TestCategory("ChangeTracking")] public void advisedAction_ctor_invalid_proposed_action() { - AdvisedAction actual = new AdvisedAction(new object(), (ProposedActions)1000); + Assert.ThrowsExactly(() => + { + AdvisedAction actual = new AdvisedAction(new object(), (ProposedActions)1000); + }); } } } \ No newline at end of file diff --git a/src/Radical.Tests/ChangeTracking/AdvisoryBuilderTests.cs b/src/Radical.Tests/ChangeTracking/AdvisoryBuilderTests.cs index 0cdcf769..db8f8452 100644 --- a/src/Radical.Tests/ChangeTracking/AdvisoryBuilderTests.cs +++ b/src/Radical.Tests/ChangeTracking/AdvisoryBuilderTests.cs @@ -19,29 +19,35 @@ public void advisoryBuilder_ctor() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void advisoryBuilder_ctor_null_visitor() { - var actual = new AdvisoryBuilder(null); + Assert.ThrowsExactly(() => + { + var actual = new AdvisoryBuilder(null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void advisoryBuilder_generateAdvisory_null_service_reference() { - var actual = new AdvisoryBuilder(new ChangeSetDistinctVisitor()); - actual.GenerateAdvisory(null, null); + Assert.ThrowsExactly(() => + { + var actual = new AdvisoryBuilder(new ChangeSetDistinctVisitor()); + actual.GenerateAdvisory(null, null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void advisoryBuilder_generateAdvisory_null_changeSet_reference() { - var actual = new AdvisoryBuilder(new ChangeSetDistinctVisitor()); - actual.GenerateAdvisory(new ChangeTrackingService(), null); + Assert.ThrowsExactly(() => + { + var actual = new AdvisoryBuilder(new ChangeSetDistinctVisitor()); + actual.GenerateAdvisory(new ChangeTrackingService(), null); + }); } [TestMethod] @@ -213,25 +219,27 @@ public void advisoryBuilder_generateAdvisory_for_non_transient_and_deleted_entit } [TestMethod] - [ExpectedException(typeof(NotSupportedException))] [TestCategory("ChangeTracking")] public void advisoryBuilder_generateAdvisory_unsupported_proposedActions_value() { - var entity = new object(); - var entityState = EntityTrackingStates.HasBackwardChanges; + Assert.ThrowsExactly(() => + { + var entity = new object(); + var entityState = EntityTrackingStates.HasBackwardChanges; - var c1 = A.Fake(); - A.CallTo(() => c1.GetChangedEntities()).Returns(new object[] { entity }); - A.CallTo(() => c1.GetAdvisedAction(entity)).Returns(ProposedActions.None); + var c1 = A.Fake(); + A.CallTo(() => c1.GetChangedEntities()).Returns(new object[] { entity }); + A.CallTo(() => c1.GetAdvisedAction(entity)).Returns(ProposedActions.None); - var cSet = new ChangeSet(new IChange[] { c1 }); + var cSet = new ChangeSet(new IChange[] { c1 }); - var svc = A.Fake(); - A.CallTo(() => svc.GetEntityState(entity)).Returns(entityState); - A.CallTo(() => svc.GetEntities(EntityTrackingStates.IsTransient, true)).Returns(new object[0]); + var svc = A.Fake(); + A.CallTo(() => svc.GetEntityState(entity)).Returns(entityState); + A.CallTo(() => svc.GetEntities(EntityTrackingStates.IsTransient, true)).Returns(new object[0]); - var actual = new AdvisoryBuilder(new ChangeSetDistinctVisitor()); - IAdvisory advisory = actual.GenerateAdvisory(svc, cSet); + var actual = new AdvisoryBuilder(new ChangeSetDistinctVisitor()); + IAdvisory advisory = actual.GenerateAdvisory(svc, cSet); + }); } } } \ No newline at end of file diff --git a/src/Radical.Tests/ChangeTracking/AdvisoryTests.cs b/src/Radical.Tests/ChangeTracking/AdvisoryTests.cs index 2ee8237e..8b0fda23 100644 --- a/src/Radical.Tests/ChangeTracking/AdvisoryTests.cs +++ b/src/Radical.Tests/ChangeTracking/AdvisoryTests.cs @@ -28,11 +28,13 @@ public void advisory_ctor() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void advisory_ctor_null_reference() { - var actual = new Advisory(null); + Assert.ThrowsExactly(() => + { + var actual = new Advisory(null); + }); } } } \ No newline at end of file diff --git a/src/Radical.Tests/ChangeTracking/BookmarkTests.cs b/src/Radical.Tests/ChangeTracking/BookmarkTests.cs index 5fe45312..6cebcbab 100644 --- a/src/Radical.Tests/ChangeTracking/BookmarkTests.cs +++ b/src/Radical.Tests/ChangeTracking/BookmarkTests.cs @@ -44,11 +44,13 @@ public class BookmarkTests //} [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void bookmark_null_owner__null_change_null_transientEntities_iChangeTrackingService_ctor_raise_argumentNullException_on_owner() { - Bookmark bmk = new Bookmark((IChangeTrackingService)null, (IChange)null, (IEnumerable)null); + Assert.ThrowsExactly(() => + { + Bookmark bmk = new Bookmark((IChangeTrackingService)null, (IChange)null, (IEnumerable)null); + }); } //[TestMethod] diff --git a/src/Radical.Tests/ChangeTracking/ChangeSetDistinctVisitorTest.cs b/src/Radical.Tests/ChangeTracking/ChangeSetDistinctVisitorTest.cs index 4f293b5b..1c614302 100644 --- a/src/Radical.Tests/ChangeTracking/ChangeSetDistinctVisitorTest.cs +++ b/src/Radical.Tests/ChangeTracking/ChangeSetDistinctVisitorTest.cs @@ -32,12 +32,14 @@ public void changeSetDistinctVisitor_visit() } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void changeSetDistinctVisitor_visit_null_changeSet_reference() { - ChangeSetDistinctVisitor target = new ChangeSetDistinctVisitor(); - target.Visit(null); + Assert.ThrowsExactly(() => + { + ChangeSetDistinctVisitor target = new ChangeSetDistinctVisitor(); + target.Visit(null); + }); } } } diff --git a/src/Radical.Tests/ChangeTracking/ChangeSetTests.cs b/src/Radical.Tests/ChangeTracking/ChangeSetTests.cs index d8aef0e4..9fba4bf1 100644 --- a/src/Radical.Tests/ChangeTracking/ChangeSetTests.cs +++ b/src/Radical.Tests/ChangeTracking/ChangeSetTests.cs @@ -28,11 +28,13 @@ public void changeSet_ctor() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void changeSet_ctor_null_reference() { - var actual = new ChangeSet(null); + Assert.ThrowsExactly(() => + { + var actual = new ChangeSet(null); + }); } } } \ No newline at end of file diff --git a/src/Radical.Tests/ChangeTracking/ChangeTest.cs b/src/Radical.Tests/ChangeTracking/ChangeTest.cs index 8a61d62b..1153d642 100644 --- a/src/Radical.Tests/ChangeTracking/ChangeTest.cs +++ b/src/Radical.Tests/ChangeTracking/ChangeTest.cs @@ -66,11 +66,13 @@ public void generic_iChange_null_commitCallback() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void generic_iChange_ctor_null_owner_argumentNullException() { - var target = new ChangeMock(null, "Foo", null, null, string.Empty); + Assert.ThrowsExactly(() => + { + var target = new ChangeMock(null, "Foo", null, null, string.Empty); + }); } [TestMethod] @@ -115,43 +117,49 @@ public void generic_iChange_rejectCallback_is_invoked_with_expected_values() } [TestMethod] - [ExpectedException(typeof(ArgumentException))] [TestCategory("ChangeTracking")] public void generic_iChange_reject_invoked_with_invalid_rejectReason() { - var owner = new object(); - var value = "Foo"; - RejectCallback rc = e => { }; - CommitCallback cc = null; - var description = string.Empty; - var reason = RejectReason.None; - - var target = new ChangeMock(owner, value, rc, cc, description); - target.Reject(reason); + Assert.ThrowsExactly(() => + { + var owner = new object(); + var value = "Foo"; + RejectCallback rc = e => { }; + CommitCallback cc = null; + var description = string.Empty; + var reason = RejectReason.None; + + var target = new ChangeMock(owner, value, rc, cc, description); + target.Reject(reason); + }); } [TestMethod] - [ExpectedException(typeof(EnumValueOutOfRangeException))] [TestCategory("ChangeTracking")] public void generic_iChange_reject_invoked_with_outOfRange_rejectReason() { - var owner = new object(); - var value = "Foo"; - RejectCallback rc = e => { }; - CommitCallback cc = null; - var description = string.Empty; - var reason = (RejectReason)1000; - - var target = new ChangeMock(owner, value, rc, cc, description); - target.Reject(reason); + Assert.ThrowsExactly(() => + { + var owner = new object(); + var value = "Foo"; + RejectCallback rc = e => { }; + CommitCallback cc = null; + var description = string.Empty; + var reason = (RejectReason)1000; + + var target = new ChangeMock(owner, value, rc, cc, description); + target.Reject(reason); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void generic_iChange_ctor_null_rejectCallback_argumentNullException() { - var target = new ChangeMock(new object(), "Foo", null, null, string.Empty); + Assert.ThrowsExactly(() => + { + var target = new ChangeMock(new object(), "Foo", null, null, string.Empty); + }); } [TestMethod] @@ -197,35 +205,39 @@ public void generic_iChange_committed_fired() } [TestMethod] - [ExpectedException(typeof(ArgumentException))] [TestCategory("ChangeTracking")] public void generic_iChange_commit_invoked_with_invalid_rejectReason() { - var owner = new object(); - var value = "Foo"; - RejectCallback rc = e => { }; - CommitCallback cc = e => { }; - var description = string.Empty; - var reason = CommitReason.None; - - var target = new ChangeMock(owner, value, rc, cc, description); - target.Commit(reason); + Assert.ThrowsExactly(() => + { + var owner = new object(); + var value = "Foo"; + RejectCallback rc = e => { }; + CommitCallback cc = e => { }; + var description = string.Empty; + var reason = CommitReason.None; + + var target = new ChangeMock(owner, value, rc, cc, description); + target.Commit(reason); + }); } [TestMethod] - [ExpectedException(typeof(EnumValueOutOfRangeException))] [TestCategory("ChangeTracking")] public void generic_iChange_commit_invoked_with_outOfRange_rejectReason() { - var owner = new object(); - var value = "Foo"; - RejectCallback rc = e => { }; - CommitCallback cc = e => { }; - var description = string.Empty; - var reason = (CommitReason)1000; - - var target = new ChangeMock(owner, value, rc, cc, description); - target.Commit(reason); + Assert.ThrowsExactly(() => + { + var owner = new object(); + var value = "Foo"; + RejectCallback rc = e => { }; + CommitCallback cc = e => { }; + var description = string.Empty; + var reason = (CommitReason)1000; + + var target = new ChangeMock(owner, value, rc, cc, description); + target.Commit(reason); + }); } [TestMethod] diff --git a/src/Radical.Tests/ChangeTracking/IncludeAllChangeSetFilterTests.cs b/src/Radical.Tests/ChangeTracking/IncludeAllChangeSetFilterTests.cs index 0691e57e..b7e92887 100644 --- a/src/Radical.Tests/ChangeTracking/IncludeAllChangeSetFilterTests.cs +++ b/src/Radical.Tests/ChangeTracking/IncludeAllChangeSetFilterTests.cs @@ -32,12 +32,14 @@ public void filter_shouldInclude_is_always_true() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void filter_argumentNullException_on_shouldInclude_null_iChange_reference() { - var target = IncludeAllChangeSetFilter.Instance; - target.ShouldInclude(null); + Assert.ThrowsExactly(() => + { + var target = IncludeAllChangeSetFilter.Instance; + target.ShouldInclude(null); + }); } } } \ No newline at end of file diff --git a/src/Radical.Tests/ChangeTracking/ReferenceEqualityComparerTest.cs b/src/Radical.Tests/ChangeTracking/ReferenceEqualityComparerTest.cs index eb551831..bcec8279 100644 --- a/src/Radical.Tests/ChangeTracking/ReferenceEqualityComparerTest.cs +++ b/src/Radical.Tests/ChangeTracking/ReferenceEqualityComparerTest.cs @@ -79,12 +79,14 @@ public void generic_iEqualityComparer_getHashCode() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void generic_iEqualityComparer_getHashCode_null_reference() { - IEqualityComparer instance = new ReferenceEqualityComparer(); - int actual = instance.GetHashCode(null); + Assert.ThrowsExactly(() => + { + IEqualityComparer instance = new ReferenceEqualityComparer(); + int actual = instance.GetHashCode(null); + }); } [TestMethod] @@ -149,12 +151,14 @@ public void iEqualityComparer_getHashCode() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void iEqualityComparer_getHashCode_null_reference() { - IEqualityComparer instance = new ReferenceEqualityComparer(); - int actual = instance.GetHashCode(null); + Assert.ThrowsExactly(() => + { + IEqualityComparer instance = new ReferenceEqualityComparer(); + int actual = instance.GetHashCode(null); + }); } } } diff --git a/src/Radical.Tests/ChangeTracking/Service/EntityChangeTrackingServiceTests.cs b/src/Radical.Tests/ChangeTracking/Service/EntityChangeTrackingServiceTests.cs index d2037ca9..36542179 100644 --- a/src/Radical.Tests/ChangeTracking/Service/EntityChangeTrackingServiceTests.cs +++ b/src/Radical.Tests/ChangeTracking/Service/EntityChangeTrackingServiceTests.cs @@ -357,14 +357,16 @@ public void after_explicit_registerAsTransient_with_autoRemove_false_entityTrack } [TestMethod] - [ExpectedException(typeof(ArgumentException))] [TestCategory("ChangeTracking")] public void explicit_registerAsTransient_throws_exception_if_already_registered() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - svc.RegisterTransient(p); + Person p = new Person(svc); + svc.RegisterTransient(p); + }); } [TestMethod] @@ -399,13 +401,15 @@ public void entity_registeredAsTransient_with_autoRemove_on_RejectChanges_is_no_ [TestMethod] [TestCategory("ChangeTracking")] - [ExpectedException(typeof(ArgumentException))] public void explicit_registerAsTransient_without_autoRemove_throws_exception_if_already_registered() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - svc.RegisterTransient(p, false); + Person p = new Person(svc); + svc.RegisterTransient(p, false); + }); } [TestMethod] @@ -621,125 +625,143 @@ public void after_rejectChanges_service_canRedo_is_false() } [TestMethod] - [ExpectedException(typeof(SuspendedChangeTrackingServiceException))] [TestCategory("ChangeTracking")] public void after_suspend_no_more_changes_can_be_added() { - RejectCallback cb = cv => { }; - object fakeOwner = new object(); - string change = string.Empty; - PropertyValueChange stub = new PropertyValueChange(fakeOwner, "property-name", change, cb); + Assert.ThrowsExactly(() => + { + RejectCallback cb = cv => { }; + object fakeOwner = new object(); + string change = string.Empty; + PropertyValueChange stub = new PropertyValueChange(fakeOwner, "property-name", change, cb); - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Suspend(); + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Suspend(); - svc.Add(stub, AddChangeBehavior.RedoRequest); + svc.Add(stub, AddChangeBehavior.RedoRequest); + }); } [TestMethod] - [ExpectedException(typeof(SuspendedChangeTrackingServiceException))] [TestCategory("ChangeTracking")] public void after_suspend_cannot_call_RegisterTransient() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc, false); - svc.Suspend(); - svc.RegisterTransient(p); + Person p = new Person(svc, false); + svc.Suspend(); + svc.RegisterTransient(p); + }); } [TestMethod] - [ExpectedException(typeof(SuspendedChangeTrackingServiceException))] [TestCategory("ChangeTracking")] public void after_suspend_cannot_call_RegisterTransient_with_explicit_autoRemove_true() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc, false); - svc.Suspend(); - svc.RegisterTransient(p, true); + Person p = new Person(svc, false); + svc.Suspend(); + svc.RegisterTransient(p, true); + }); } [TestMethod] - [ExpectedException(typeof(SuspendedChangeTrackingServiceException))] [TestCategory("ChangeTracking")] public void after_suspend_cannot_call_RegisterTransient_with_explicit_autoRemove_false() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc, false); - svc.Suspend(); - svc.RegisterTransient(p, false); + Person p = new Person(svc, false); + svc.Suspend(); + svc.RegisterTransient(p, false); + }); } [TestMethod] - [ExpectedException(typeof(SuspendedChangeTrackingServiceException))] [TestCategory("ChangeTracking")] public void after_suspend_cannot_call_Undo() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - p.Name = "Mauro"; + Person p = new Person(svc); + p.Name = "Mauro"; - svc.Suspend(); - svc.Undo(); + svc.Suspend(); + svc.Undo(); + }); } [TestMethod] - [ExpectedException(typeof(SuspendedChangeTrackingServiceException))] [TestCategory("ChangeTracking")] public void after_suspend_cannot_call_Redo() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - p.Name = "Mauro"; - svc.Undo(); + Person p = new Person(svc); + p.Name = "Mauro"; + svc.Undo(); - svc.Suspend(); - svc.Redo(); + svc.Suspend(); + svc.Redo(); + }); } [TestMethod] - [ExpectedException(typeof(SuspendedChangeTrackingServiceException))] [TestCategory("ChangeTracking")] public void after_suspend_cannot_call_AcceptChanges() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - p.Name = "Mauro"; + Person p = new Person(svc); + p.Name = "Mauro"; - svc.Suspend(); - svc.AcceptChanges(); + svc.Suspend(); + svc.AcceptChanges(); + }); } [TestMethod] - [ExpectedException(typeof(SuspendedChangeTrackingServiceException))] [TestCategory("ChangeTracking")] public void after_suspend_cannot_call_RejectChanges() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - p.Name = "Mauro"; + Person p = new Person(svc); + p.Name = "Mauro"; - svc.Suspend(); - svc.RejectChanges(); + svc.Suspend(); + svc.RejectChanges(); + }); } [TestMethod] - [ExpectedException(typeof(SuspendedChangeTrackingServiceException))] [TestCategory("ChangeTracking")] public void after_suspend_cannot_call_UnregisterTransient() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); + Person p = new Person(svc); - svc.Suspend(); - svc.UnregisterTransient(p); + svc.Suspend(); + svc.UnregisterTransient(p); + }); } [TestMethod] @@ -806,12 +828,14 @@ public void service_initial_state_isChanged_is_false() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_on_null_iChange_add_argumentNullException() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Add(null, AddChangeBehavior.RedoRequest); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Add(null, AddChangeBehavior.RedoRequest); + }); } [TestMethod] @@ -847,25 +871,29 @@ public void service_after_add_getChangeSet_return_valid_cSet() } [TestMethod] - [ExpectedException(typeof(NotSupportedException))] [TestCategory("ChangeTracking")] public void service_add_notSupported_AddChangeBehavior() { - IChange stub = A.Dummy(); + Assert.ThrowsExactly(() => + { + IChange stub = A.Dummy(); - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Add(stub, AddChangeBehavior.None); + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Add(stub, AddChangeBehavior.None); + }); } [TestMethod] - [ExpectedException(typeof(EnumValueOutOfRangeException))] [TestCategory("ChangeTracking")] public void service_add_invalid_AddChangeBehavior() { - IChange stub = A.Dummy(); + Assert.ThrowsExactly(() => + { + IChange stub = A.Dummy(); - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Add(stub, (AddChangeBehavior)1000); + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Add(stub, (AddChangeBehavior)1000); + }); } [TestMethod] @@ -896,12 +924,14 @@ public void service_with_no_changes_create_non_null_bookmark() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_cannot_validate_a_null_bookmark() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Validate(null); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Validate(null); + }); } [TestMethod] @@ -949,24 +979,28 @@ public void service_validate_a_bookmark_invalid_is_false() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_revert_with_a_null_bookmark() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Revert(null); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Revert(null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] [TestCategory("ChangeTracking")] public void service_revert_to_a_bookmark_created_by_another_service() { - ChangeTrackingService svc1 = new ChangeTrackingService(); - IBookmark bmk = svc1.CreateBookmark(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc1 = new ChangeTrackingService(); + IBookmark bmk = svc1.CreateBookmark(); - ChangeTrackingService svc2 = new ChangeTrackingService(); - svc2.Revert(bmk); + ChangeTrackingService svc2 = new ChangeTrackingService(); + svc2.Revert(bmk); + }); } [TestMethod] @@ -1028,18 +1062,20 @@ public void service_successfully_revert_to_a_valid_bookmark_created_at_initial_s } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] [TestCategory("ChangeTracking")] public void service_cannot_revert_to_an_invalid_bookmark() { - ChangeTrackingService svc = new ChangeTrackingService(); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - p.Name = "Mauro"; + Person p = new Person(svc); + p.Name = "Mauro"; - var bmk = svc.CreateBookmark(); - svc.Undo(); - svc.Revert(bmk); + var bmk = svc.CreateBookmark(); + svc.Undo(); + svc.Revert(bmk); + }); } [TestMethod] @@ -1104,12 +1140,14 @@ public void service_generate_valid_adivsory_with_valid_iAdvisoryBuilder() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_getAdvisory_with_null_iAdvisoryBuilder_argumentNull_Exception() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.GetAdvisory(null); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.GetAdvisory(null); + }); } [TestMethod] @@ -1124,21 +1162,25 @@ public void service_getChangeSet_when_is_not_changed_empty_cSet() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_getChangeSet_with_null_iChangeSetFilter_argumentNullExeption() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.GetChangeSet(null); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.GetChangeSet(null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_getChangeSet_with_null_iChangeSetFilter() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.GetChangeSet(null); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.GetChangeSet(null); + }); } [TestMethod] @@ -1301,60 +1343,72 @@ public void service_getEntities_state_Transient_exactMatch_false_entity_in_Chang } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_registerTransient_null_reference_argumentNullException() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.RegisterTransient(null); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.RegisterTransient(null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_registerTransient_null_reference_explicit_autoRemove_true_argumentNullException() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.RegisterTransient(null, true); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.RegisterTransient(null, true); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_registerTransient_null_reference_explicit_autoRemove_false_argumentNullException() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.RegisterTransient(null, false); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.RegisterTransient(null, false); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentException))] [TestCategory("ChangeTracking")] public void service_double_registerTransient_with_same_reference_invalidOperationException() { - ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - svc.RegisterTransient(p); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + Person p = new Person(svc); + svc.RegisterTransient(p); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentException))] [TestCategory("ChangeTracking")] public void service_double_registerTransient_with_same_reference_and_explicit_autoRemove_true_invalidOperationException() { - ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - svc.RegisterTransient(p, true); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + Person p = new Person(svc); + svc.RegisterTransient(p, true); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentException))] [TestCategory("ChangeTracking")] public void service_double_registerTransient_with_same_reference_and_explicit_autoRemove_false_invalidOperationException() { - ChangeTrackingService svc = new ChangeTrackingService(); - Person p = new Person(svc); - svc.RegisterTransient(p, false); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + Person p = new Person(svc); + svc.RegisterTransient(p, false); + }); } [TestMethod] @@ -1388,12 +1442,14 @@ public void service_registerTransient_valid_reference_and_explicit_autoRemove_fa } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] [TestCategory("ChangeTracking")] public void service_unregisterTransient_null_reference_argumentNullException() { - ChangeTrackingService svc = new ChangeTrackingService(); - svc.UnregisterTransient(null); + Assert.ThrowsExactly(() => + { + ChangeTrackingService svc = new ChangeTrackingService(); + svc.UnregisterTransient(null); + }); } [TestMethod] @@ -1411,14 +1467,16 @@ public void service_unregisterTransient_valid_reference() } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] [TestCategory("ChangeTracking")] public void service_unregisterTransient_reference_not_registered_as_transient() { - Person p = new Person(null); + Assert.ThrowsExactly(() => + { + Person p = new Person(null); - ChangeTrackingService svc = new ChangeTrackingService(); - svc.UnregisterTransient(p); + ChangeTrackingService svc = new ChangeTrackingService(); + svc.UnregisterTransient(p); + }); } [TestMethod] @@ -1978,79 +2036,87 @@ public void service_on_change_commit_remove_change_from_changesStack() } [TestMethod] - [ExpectedException(typeof(EnumValueOutOfRangeException))] [TestCategory("ChangeTracking")] public void service_on_change_commit_EnumValueOutOfRangeException_on_invalid_commit_reason_with_hacked_property_change() { - RejectCallback rc = e => { }; - CommitCallback cc = e => { }; - object fakeOwner = new object(); - string change = "Foo"; + Assert.ThrowsExactly(() => + { + RejectCallback rc = e => { }; + CommitCallback cc = e => { }; + object fakeOwner = new object(); + string change = "Foo"; - var iChange = new HackedPropertyValueChange(fakeOwner, change, rc, cc); - iChange.HackedCommitReason = (CommitReason)1000; + var iChange = new HackedPropertyValueChange(fakeOwner, change, rc, cc); + iChange.HackedCommitReason = (CommitReason)1000; - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Add(iChange, AddChangeBehavior.Default); + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Add(iChange, AddChangeBehavior.Default); - iChange.Commit(CommitReason.AcceptChanges); + iChange.Commit(CommitReason.AcceptChanges); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] [TestCategory("ChangeTracking")] public void service_on_change_commit_ArgumentOutOfRangeException_on_none_commit_reason_with_hacked_property_change() { - RejectCallback rc = e => { }; - CommitCallback cc = e => { }; - object fakeOwner = new object(); - string change = "Foo"; + Assert.ThrowsExactly(() => + { + RejectCallback rc = e => { }; + CommitCallback cc = e => { }; + object fakeOwner = new object(); + string change = "Foo"; - var iChange = new HackedPropertyValueChange(fakeOwner, change, rc, cc); - iChange.HackedCommitReason = CommitReason.None; + var iChange = new HackedPropertyValueChange(fakeOwner, change, rc, cc); + iChange.HackedCommitReason = CommitReason.None; - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Add(iChange, AddChangeBehavior.Default); + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Add(iChange, AddChangeBehavior.Default); - iChange.Commit(CommitReason.AcceptChanges); + iChange.Commit(CommitReason.AcceptChanges); + }); } [TestMethod] - [ExpectedException(typeof(EnumValueOutOfRangeException))] [TestCategory("ChangeTracking")] public void service_on_change_reject_EnumValueOutOfRangeException_on_invalid_commit_reason_with_hacked_property_change() { - RejectCallback rc = e => { }; - CommitCallback cc = e => { }; - object fakeOwner = new object(); - string change = "Foo"; + Assert.ThrowsExactly(() => + { + RejectCallback rc = e => { }; + CommitCallback cc = e => { }; + object fakeOwner = new object(); + string change = "Foo"; - var iChange = new HackedPropertyValueChange(fakeOwner, change, rc, cc); - iChange.HackedRejectReason = (RejectReason)1000; + var iChange = new HackedPropertyValueChange(fakeOwner, change, rc, cc); + iChange.HackedRejectReason = (RejectReason)1000; - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Add(iChange, AddChangeBehavior.Default); + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Add(iChange, AddChangeBehavior.Default); - iChange.Reject(RejectReason.RejectChanges); + iChange.Reject(RejectReason.RejectChanges); + }); } [TestMethod] - [ExpectedException(typeof(NotSupportedException))] [TestCategory("ChangeTracking")] public void service_on_change_reject_NotSupportedException_on_none_commit_reason_with_hacked_property_change() { - RejectCallback rc = e => { }; - CommitCallback cc = e => { }; - object fakeOwner = new object(); - string change = "Foo"; + Assert.ThrowsExactly(() => + { + RejectCallback rc = e => { }; + CommitCallback cc = e => { }; + object fakeOwner = new object(); + string change = "Foo"; - var iChange = new HackedPropertyValueChange(fakeOwner, change, rc, cc); - iChange.HackedRejectReason = RejectReason.None; + var iChange = new HackedPropertyValueChange(fakeOwner, change, rc, cc); + iChange.HackedRejectReason = RejectReason.None; - ChangeTrackingService svc = new ChangeTrackingService(); - svc.Add(iChange, AddChangeBehavior.Default); + ChangeTrackingService svc = new ChangeTrackingService(); + svc.Add(iChange, AddChangeBehavior.Default); - iChange.Reject(RejectReason.RejectChanges); + iChange.Reject(RejectReason.RejectChanges); + }); } [TestMethod] diff --git a/src/Radical.Tests/ContractAttributeTest.cs b/src/Radical.Tests/ContractAttributeTest.cs index 7b989f45..14e945e4 100644 --- a/src/Radical.Tests/ContractAttributeTest.cs +++ b/src/Radical.Tests/ContractAttributeTest.cs @@ -37,10 +37,12 @@ public void ContractAttribute_ctor() } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void ContractAttribute_ctor_argumentNullException_on_null_contract() { - ContractAttribute target = new ContractAttribute(null); + Assert.ThrowsExactly(() => + { + ContractAttribute target = new ContractAttribute(null); + }); } [TestMethod()] diff --git a/src/Radical.Tests/EnumItemDescriptionAttributeTest.cs b/src/Radical.Tests/EnumItemDescriptionAttributeTest.cs index c7d9d7ce..7f7b1936 100644 --- a/src/Radical.Tests/EnumItemDescriptionAttributeTest.cs +++ b/src/Radical.Tests/EnumItemDescriptionAttributeTest.cs @@ -91,10 +91,12 @@ public void EnumItemDescriptionAttribute_Index() } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void EnumItemDescriptionAttribute_ctor_null_caption() { - EnumItemDescriptionAttribute target = CreateMock(null); + Assert.ThrowsExactly(() => + { + EnumItemDescriptionAttribute target = CreateMock(null); + }); } } } diff --git a/src/Radical.Tests/Extensions/ArrayExtensionsTests.cs b/src/Radical.Tests/Extensions/ArrayExtensionsTests.cs index a281450e..33736990 100644 --- a/src/Radical.Tests/Extensions/ArrayExtensionsTests.cs +++ b/src/Radical.Tests/Extensions/ArrayExtensionsTests.cs @@ -66,17 +66,21 @@ public void arrayExtensions_isSameAs_using_null_other_should_return_arrays_diseq } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void arrayExtensions_isSameAs_using_null_source_should_raise_ArgumentNullException() { - ArrayExtensions.IsSameAs(null, new[] { 1, 2, 3 }); + Assert.ThrowsExactly(() => + { + ArrayExtensions.IsSameAs(null, new[] { 1, 2, 3 }); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void arrayExtensions_isSameAs_using_null_comparer_should_raise_ArgumentNullException() { - ArrayExtensions.IsSameAs(new object[0], null, null); + Assert.ThrowsExactly(() => + { + ArrayExtensions.IsSameAs(new object[0], null, null); + }); } } } diff --git a/src/Radical.Tests/Extensions/EnumExtensionTest.cs b/src/Radical.Tests/Extensions/EnumExtensionTest.cs index ae9dfc7c..360a527f 100644 --- a/src/Radical.Tests/Extensions/EnumExtensionTest.cs +++ b/src/Radical.Tests/Extensions/EnumExtensionTest.cs @@ -39,11 +39,13 @@ private enum FlaggedTestEnum } [TestMethod()] - [ExpectedException(typeof(EnumValueOutOfRangeException))] public void EnumInvalidValueValidation() { - TestEnum actual = (TestEnum)(-1); - EnumExtensions.EnsureIsDefined(actual); + Assert.ThrowsExactly(() => + { + TestEnum actual = (TestEnum)(-1); + EnumExtensions.EnsureIsDefined(actual); + }); } [TestMethod()] @@ -88,11 +90,13 @@ public void EnumExtension_GetDescriptionAttribute() } [TestMethod()] - [ExpectedException(typeof(ArgumentException))] public void EnumExtension_GetDescriptionAttribute_failure() { - TestEnum val = TestEnum.ValueWithoutAttribute; - EnumItemDescriptionAttribute actual = EnumExtensions.GetDescriptionAttribute(val); + Assert.ThrowsExactly(() => + { + TestEnum val = TestEnum.ValueWithoutAttribute; + EnumItemDescriptionAttribute actual = EnumExtensions.GetDescriptionAttribute(val); + }); } [TestMethod()] diff --git a/src/Radical.Tests/Extensions/EnumerableExtensionTest.cs b/src/Radical.Tests/Extensions/EnumerableExtensionTest.cs index bd296d3d..91d52bde 100644 --- a/src/Radical.Tests/Extensions/EnumerableExtensionTest.cs +++ b/src/Radical.Tests/Extensions/EnumerableExtensionTest.cs @@ -13,17 +13,21 @@ namespace Radical.Tests.Extensions public class EnumerableExtensionTest { [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void ForEachTest_null_list() { - Linq.EnumerableExtensions.ForEach(null, a => a++); + Assert.ThrowsExactly(() => + { + Linq.EnumerableExtensions.ForEach(null, a => a++); + }); } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void ForEachTest_null_action() { - Linq.EnumerableExtensions.ForEach(new[] { 0, 1, 2 }, null); + Assert.ThrowsExactly(() => + { + Linq.EnumerableExtensions.ForEach(new[] { 0, 1, 2 }, null); + }); } [TestMethod()] @@ -46,10 +50,12 @@ public void ForEachTest_return_value_not_null() } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void AsReadOnly_null_expects_exception() { - Linq.EnumerableExtensions.AsReadOnly(null); + Assert.ThrowsExactly(() => + { + Linq.EnumerableExtensions.AsReadOnly(null); + }); } [TestMethod()] @@ -83,17 +89,21 @@ public void iEnumerableExtensions_enumerate_normal_should_invoke_actions() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void iEnumerableExtensions_enumerate_null_list_reference_should_raise_ArgumentNullException() { - Linq.EnumerableExtensions.Enumerate(null, null); + Assert.ThrowsExactly(() => + { + Linq.EnumerableExtensions.Enumerate(null, null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void iEnumerableExtensions_enumerate_null_action_reference_should_raise_ArgumentNullException() { - Linq.EnumerableExtensions.Enumerate(new object[0], null); + Assert.ThrowsExactly(() => + { + Linq.EnumerableExtensions.Enumerate(new object[0], null); + }); } [TestMethod] @@ -152,11 +162,13 @@ public void enumerableExtensions_alternateWith_using_single_item_list_should_ret } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void enumerableExtensions_alternateWith_using_null_list_should_throw_ArgumentNullException() { - var x = Linq.EnumerableExtensions.AlternateWith(null, null); - x.ToList(); + Assert.ThrowsExactly(() => + { + var x = Linq.EnumerableExtensions.AlternateWith(null, null); + x.ToList(); + }); } [TestMethod] diff --git a/src/Radical.Tests/Helpers/CommandLineTests.cs b/src/Radical.Tests/Helpers/CommandLineTests.cs index 8d4acb19..c3a831e0 100644 --- a/src/Radical.Tests/Helpers/CommandLineTests.cs +++ b/src/Radical.Tests/Helpers/CommandLineTests.cs @@ -161,11 +161,13 @@ public void CommandLine_as_using_valid_command_line_and_class_should_convert_com [TestMethod] [TestCategory("CommandLine")] - [ExpectedException(typeof(ArgumentException))] public void CommandLine_as_using_valid_command_line_and_class_should_not_convert_command_line_to_class_instance_using_missing_required_arguments() { - var target = new CommandLine(new string[0]); - var instance = target.As(); + Assert.ThrowsExactly(() => + { + var target = new CommandLine(new string[0]); + var instance = target.As(); + }); } [TestMethod] diff --git a/src/Radical.Tests/Helpers/EnumBinderTest.cs b/src/Radical.Tests/Helpers/EnumBinderTest.cs index 7cf68aba..85990362 100644 --- a/src/Radical.Tests/Helpers/EnumBinderTest.cs +++ b/src/Radical.Tests/Helpers/EnumBinderTest.cs @@ -39,11 +39,13 @@ public void EnumBinder_enumItemDescriptionAttribute_object_ctor() } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void EnumBinder_enumItemDescriptionAttribute_object_ctor_null_attribute() { - var value = TestEnum.Value2; - var target = new EnumBinder((EnumItemDescriptionAttribute)null, value); + Assert.ThrowsExactly(() => + { + var value = TestEnum.Value2; + var target = new EnumBinder((EnumItemDescriptionAttribute)null, value); + }); } [TestMethod()] @@ -98,22 +100,26 @@ public void EnumBinder_string_object_int32_ctor() } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void EnumBinder_string_object_null_description() { - var description = (string)null; - var value = TestEnum.Value2; - var target = new EnumBinder(description, value); + Assert.ThrowsExactly(() => + { + var description = (string)null; + var value = TestEnum.Value2; + var target = new EnumBinder(description, value); + }); } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void EnumBinder_string_object_int32_null_description() { - var description = (string)null; - var value = TestEnum.Value2; - var index = 0; - var target = new EnumBinder(description, value, index); + Assert.ThrowsExactly(() => + { + var description = (string)null; + var value = TestEnum.Value2; + var index = 0; + var target = new EnumBinder(description, value, index); + }); } [TestMethod()] diff --git a/src/Radical.Tests/Helpers/MemberInfoExtensionTest.cs b/src/Radical.Tests/Helpers/MemberInfoExtensionTest.cs index 0b6f833b..18fead33 100644 --- a/src/Radical.Tests/Helpers/MemberInfoExtensionTest.cs +++ b/src/Radical.Tests/Helpers/MemberInfoExtensionTest.cs @@ -70,24 +70,30 @@ public void IsAttributeDefined_memberInfo_inherit_false() } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void IsAttributeDefined_null_memberInfo() { - MemberInfoExtensions.IsAttributeDefined(null); + Assert.ThrowsExactly(() => + { + MemberInfoExtensions.IsAttributeDefined(null); + }); } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void IsAttributeDefined_null_memberInfo_false() { - MemberInfoExtensions.IsAttributeDefined(null, false); + Assert.ThrowsExactly(() => + { + MemberInfoExtensions.IsAttributeDefined(null, false); + }); } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void IsAttributeDefined_null_memberInfo_true() { - MemberInfoExtensions.IsAttributeDefined(null, true); + Assert.ThrowsExactly(() => + { + MemberInfoExtensions.IsAttributeDefined(null, true); + }); } [TestMethod()] @@ -145,31 +151,39 @@ public void GetAttribute_on_inherited_true() } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void GetAttribute_null_memberInfo_true() { - MemberInfoExtensions.GetAttribute(null, true); + Assert.ThrowsExactly(() => + { + MemberInfoExtensions.GetAttribute(null, true); + }); } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void GetAttribute_null_memberInfo_false() { - MemberInfoExtensions.GetAttribute(null, true); + Assert.ThrowsExactly(() => + { + MemberInfoExtensions.GetAttribute(null, true); + }); } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void GetAttribute_null_memberInfo() { - MemberInfoExtensions.GetAttribute(null); + Assert.ThrowsExactly(() => + { + MemberInfoExtensions.GetAttribute(null); + }); } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void GetAttributes_null_memberInfo() { - MemberInfoExtensions.GetAttributes(null); + Assert.ThrowsExactly(() => + { + MemberInfoExtensions.GetAttributes(null); + }); } [TestMethod()] diff --git a/src/Radical.Tests/Helpers/ParameterInfoExtensionTest.cs b/src/Radical.Tests/Helpers/ParameterInfoExtensionTest.cs index fa339b16..8d97da29 100644 --- a/src/Radical.Tests/Helpers/ParameterInfoExtensionTest.cs +++ b/src/Radical.Tests/Helpers/ParameterInfoExtensionTest.cs @@ -85,10 +85,12 @@ public void IsAttributeDefined_parameterInfo_using_inherited_attribute_but_searc } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void IsAttributeDefined_null_parameterInfo() { - ParameterInfoExtension.IsAttributeDefined(null); + Assert.ThrowsExactly(() => + { + ParameterInfoExtension.IsAttributeDefined(null); + }); } [TestMethod()] @@ -101,17 +103,21 @@ public void GetAttribute() } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void GetAttribute_null_parameterInfo() { - ParameterInfoExtension.GetAttribute(null); + Assert.ThrowsExactly(() => + { + ParameterInfoExtension.GetAttribute(null); + }); } [TestMethod()] - [ExpectedException(typeof(ArgumentNullException))] public void GetAttributes_null_parameterInfo() { - ParameterInfoExtension.GetAttributes(null); + Assert.ThrowsExactly(() => + { + ParameterInfoExtension.GetAttributes(null); + }); } [TestMethod()] diff --git a/src/Radical.Tests/Helpers/RandomStringsTests.cs b/src/Radical.Tests/Helpers/RandomStringsTests.cs index cda8242b..c376883e 100644 --- a/src/Radical.Tests/Helpers/RandomStringsTests.cs +++ b/src/Radical.Tests/Helpers/RandomStringsTests.cs @@ -108,7 +108,7 @@ public void Generated_string_by_default_should_allow_consecutive_equal_chars() [TestMethod] public void Generated_string_by_default_allow_consecutive_and_no_allow_repeated_should_throw() { - Assert.ThrowsException(() => + Assert.ThrowsExactly(() => { var sut = new RandomStrings { AllowConsecutiveCharacters = true, AllowRepeatCharacters = false}; sut.Next(); diff --git a/src/Radical.Tests/Helpers/StringExtensionTests.cs b/src/Radical.Tests/Helpers/StringExtensionTests.cs index 42eb036c..e4415db9 100644 --- a/src/Radical.Tests/Helpers/StringExtensionTests.cs +++ b/src/Radical.Tests/Helpers/StringExtensionTests.cs @@ -19,17 +19,21 @@ public void iconUriHelper_buildPackUri_normal_should_behave_as_expected() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void iconUriHelper_buildPackUri_using_null_relative_uri_should_raise_ArgumentNullException() { - Radical.StringExtensions.AsPackUri(null); + Assert.ThrowsExactly(() => + { + Radical.StringExtensions.AsPackUri(null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void iconUriHelper_buildPackUri_using_empty_relative_uri_should_raise_ArgumentOutOfRangeException() { - Radical.StringExtensions.AsPackUri(string.Empty); + Assert.ThrowsExactly(() => + { + Radical.StringExtensions.AsPackUri(string.Empty); + }); } [TestMethod] diff --git a/src/Radical.Tests/Helpers/TypeExtensionTests.cs b/src/Radical.Tests/Helpers/TypeExtensionTests.cs index 7e68c576..42a8fd78 100644 --- a/src/Radical.Tests/Helpers/TypeExtensionTests.cs +++ b/src/Radical.Tests/Helpers/TypeExtensionTests.cs @@ -20,10 +20,12 @@ public void typeExtension_toShortString_normal_should_return_valid_type_string() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void typeExtension_toShortString_using_null_type_reference_should_raise_ArgumentNullException() { - Reflection.TypeExtensions.ToShortString(null); + Assert.ThrowsExactly(() => + { + Reflection.TypeExtensions.ToShortString(null); + }); } [TestMethod] diff --git a/src/Radical.Tests/Model/Entity/EntityMementoTrackingFeaturesTests.cs b/src/Radical.Tests/Model/Entity/EntityMementoTrackingFeaturesTests.cs index 43f214e9..23b97300 100644 --- a/src/Radical.Tests/Model/Entity/EntityMementoTrackingFeaturesTests.cs +++ b/src/Radical.Tests/Model/Entity/EntityMementoTrackingFeaturesTests.cs @@ -228,23 +228,27 @@ public void entityMemento_memento_normal_onMementoChanged_is_not_invoked_setting } [TestMethod] - [ExpectedException(typeof(ObjectDisposedException))] public void entityMemento_memento_changing_on_disposed_entity_should_raise_ObjectDisposedException() { - var memento = new ChangeTrackingService(); - var target = new TestableMementoEntity(memento); - target.Dispose(); - ((IMemento)target).Memento = null; + Assert.ThrowsExactly(() => + { + var memento = new ChangeTrackingService(); + var target = new TestableMementoEntity(memento); + target.Dispose(); + ((IMemento)target).Memento = null; + }); } [TestMethod] - [ExpectedException(typeof(ObjectDisposedException))] public void entityMemento_memento_changing_on_disposed_entity_using_base_iMemento_should_raise_ObjectDisposedException() { - var memento = new ChangeTrackingService(); - var target = new TestableMementoEntity(memento); - target.Dispose(); - ((IMemento)target).Memento = null; + Assert.ThrowsExactly(() => + { + var memento = new ChangeTrackingService(); + var target = new TestableMementoEntity(memento); + target.Dispose(); + ((IMemento)target).Memento = null; + }); } [TestMethod] @@ -272,14 +276,16 @@ public void entityMemento_chacheChange_value_rejectCallback_should_be_called_wit } [TestMethod] - [ExpectedException(typeof(ObjectDisposedException))] public void entityMemento_chacheChange_value_rejectCallback_on_disposed_object_should_raise_ObjectDisposedException() { - var memento = new ChangeTrackingService(); - var target = new TestableMementoEntity(memento); - target.Dispose(); + Assert.ThrowsExactly(() => + { + var memento = new ChangeTrackingService(); + var target = new TestableMementoEntity(memento); + target.Dispose(); - target.InvokeCacheChange("Foo", cv => { }); + target.InvokeCacheChange("Foo", cv => { }); + }); } [TestMethod] @@ -330,14 +336,16 @@ public void entityMemento_chacheChange_value_rejectCallback_commitCallback_shoul } [TestMethod] - [ExpectedException(typeof(ObjectDisposedException))] public void entityMemento_chacheChange_value_rejectCallback_commitCallback_on_disposed_object_should_raise_ObjectDisposedException() { - var memento = new ChangeTrackingService(); - var target = new TestableMementoEntity(memento); - target.Dispose(); + Assert.ThrowsExactly(() => + { + var memento = new ChangeTrackingService(); + var target = new TestableMementoEntity(memento); + target.Dispose(); - target.InvokeCacheChange("Foo", cv => { }, cv => { }); + target.InvokeCacheChange("Foo", cv => { }, cv => { }); + }); } [TestMethod] @@ -388,14 +396,16 @@ public void entityMemento_chacheChange_value_rejectCallback_commitCallback_addCh } [TestMethod] - [ExpectedException(typeof(ObjectDisposedException))] public void entityMemento_chacheChange_value_rejectCallback_commitCallback_addChangeBeahvior_on_disposed_object_should_raise_ObjectDisposedException() { - var memento = new ChangeTrackingService(); - var target = new TestableMementoEntity(memento); - target.Dispose(); + Assert.ThrowsExactly(() => + { + var memento = new ChangeTrackingService(); + var target = new TestableMementoEntity(memento); + target.Dispose(); - target.InvokeCacheChange("Foo", cv => { }, cv => { }, AddChangeBehavior.Default); + target.InvokeCacheChange("Foo", cv => { }, cv => { }, AddChangeBehavior.Default); + }); } [TestMethod] @@ -490,52 +500,58 @@ public void entityMemento_cacheChangeOnRejectCallback_rejectReason_RejectChanges } [TestMethod] - [ExpectedException(typeof(ObjectDisposedException))] public void entityMemento_chacheChangeOnRejectCallback_on_disposed_entity_should_raise_ObjectDisposedException() { - var iChange = A.Dummy(); - var memento = A.Fake(); - A.CallTo(() => memento.IsSuspended).Returns(false); + Assert.ThrowsExactly(() => + { + var iChange = A.Dummy(); + var memento = A.Fake(); + A.CallTo(() => memento.IsSuspended).Returns(false); - var target = new TestableMementoEntity(memento); - target.Dispose(); + var target = new TestableMementoEntity(memento); + target.Dispose(); - var value = "foo"; - var rejArgs = new ChangeRejectedEventArgs(target, value, iChange, RejectReason.Revert); + var value = "foo"; + var rejArgs = new ChangeRejectedEventArgs(target, value, iChange, RejectReason.Revert); - target.InvokeCacheChangeOnRejectCallback(value, cv => { }, cv => { }, rejArgs); + target.InvokeCacheChangeOnRejectCallback(value, cv => { }, cv => { }, rejArgs); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void entityMemento_cacheChangeOnRejectCallback_rejectReason_none_should_raise_ArgumentOutOfRangeException() { - var iChange = A.Dummy(); - var memento = A.Fake(); - A.CallTo(() => memento.IsSuspended).Returns(false); + Assert.ThrowsExactly(() => + { + var iChange = A.Dummy(); + var memento = A.Fake(); + A.CallTo(() => memento.IsSuspended).Returns(false); - var target = new TestableMementoEntity(memento); + var target = new TestableMementoEntity(memento); - var value = "foo"; - var rejArgs = new ChangeRejectedEventArgs(target, value, iChange, RejectReason.None); + var value = "foo"; + var rejArgs = new ChangeRejectedEventArgs(target, value, iChange, RejectReason.None); - target.InvokeCacheChangeOnRejectCallback(value, cv => { }, cv => { }, rejArgs); + target.InvokeCacheChangeOnRejectCallback(value, cv => { }, cv => { }, rejArgs); + }); } [TestMethod] - [ExpectedException(typeof(EnumValueOutOfRangeException))] public void entityMemento_cacheChangeOnRejectCallback_invalid_rejectReason_should_raise_EnumValueOutOfRangeException() { - var iChange = A.Dummy(); - var memento = A.Fake(); - A.CallTo(() => memento.IsSuspended).Returns(false); + Assert.ThrowsExactly(() => + { + var iChange = A.Dummy(); + var memento = A.Fake(); + A.CallTo(() => memento.IsSuspended).Returns(false); - var target = new TestableMementoEntity(memento); + var target = new TestableMementoEntity(memento); - var value = "foo"; - var rejArgs = new ChangeRejectedEventArgs(target, value, iChange, (RejectReason)1000); + var value = "foo"; + var rejArgs = new ChangeRejectedEventArgs(target, value, iChange, (RejectReason)1000); - target.InvokeCacheChangeOnRejectCallback(value, cv => { }, cv => { }, rejArgs); + target.InvokeCacheChangeOnRejectCallback(value, cv => { }, cv => { }, rejArgs); + }); } } } diff --git a/src/Radical.Tests/Model/Entity/EntityPropertyChangedEventsTests.cs b/src/Radical.Tests/Model/Entity/EntityPropertyChangedEventsTests.cs index fdaad9a9..f134a50e 100644 --- a/src/Radical.Tests/Model/Entity/EntityPropertyChangedEventsTests.cs +++ b/src/Radical.Tests/Model/Entity/EntityPropertyChangedEventsTests.cs @@ -51,25 +51,29 @@ public void entity_propertyChanged_event_using_propertyName_raised_with_expected } [TestMethod] - [ExpectedException(typeof(ObjectDisposedException))] public void entity_propertyChanged_event_on_disposed_entity_using_propertyChangedEventArgs_should_raise_ObjectDisposedException() { - var expected = "Foo"; + Assert.ThrowsExactly(() => + { + var expected = "Foo"; - var target = new TestableEntity(); - target.Dispose(); - target.RaisePropertyChanged(new PropertyChangedEventArgs(expected)); + var target = new TestableEntity(); + target.Dispose(); + target.RaisePropertyChanged(new PropertyChangedEventArgs(expected)); + }); } [TestMethod] - [ExpectedException(typeof(ObjectDisposedException))] public void entity_propertyChanged_event_on_disposed_entity_using_propertyName_should_raise_ObjectDisposedException() { - var expected = "Foo"; + Assert.ThrowsExactly(() => + { + var expected = "Foo"; - var target = new TestableEntity(); - target.Dispose(); - target.RaisePropertyChanged(expected); + var target = new TestableEntity(); + target.Dispose(); + target.RaisePropertyChanged(expected); + }); } } } diff --git a/src/Radical.Tests/Model/Entity/SelfTrackingEntityTests.cs b/src/Radical.Tests/Model/Entity/SelfTrackingEntityTests.cs index dfc090ea..68f69f6b 100644 --- a/src/Radical.Tests/Model/Entity/SelfTrackingEntityTests.cs +++ b/src/Radical.Tests/Model/Entity/SelfTrackingEntityTests.cs @@ -133,16 +133,18 @@ public void entity_create_using_initial_value_should_set_expected_value() [Ignore] [TestMethod] - [ExpectedException(typeof(ArgumentException))] public void entity_create_using_initial_value_is_reset_initial_value_should_raise_ArgumentException() { - /* - * Questo in teoria dovrebbe sollevare - * una exception perchè stiamo cambiando il DefaultValue - * dopo che è stato inizializzato... non credo abbia più molto senso - */ - var target = new MockEntity("Mauro"); - target.SetInitialValue(() => target.FirstName, "Foo"); + Assert.ThrowsExactly(() => + { + /* + * Questo in teoria dovrebbe sollevare + * una exception perchè stiamo cambiando il DefaultValue + * dopo che è stato inizializzato... non credo abbia più molto senso + */ + var target = new MockEntity("Mauro"); + target.SetInitialValue(() => target.FirstName, "Foo"); + }); } [TestMethod] diff --git a/src/Radical.Tests/Model/EntityCollection/EntityCollectionTests.cs b/src/Radical.Tests/Model/EntityCollection/EntityCollectionTests.cs index cd763b34..512de951 100644 --- a/src/Radical.Tests/Model/EntityCollection/EntityCollectionTests.cs +++ b/src/Radical.Tests/Model/EntityCollection/EntityCollectionTests.cs @@ -59,17 +59,21 @@ public void entityCollection_ctor_iEnumerable_should_initialize_expected_values( } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void entityCollection_ctor_iEnumerable_null_list_should_raise_ArgumentNullException() { - CreateMock((IEnumerable)null); + Assert.ThrowsExactly(() => + { + CreateMock((IEnumerable)null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void entityCollection_ctor_int_less_then_zero_should_raise_ArgumentNullException() { - CreateMock(-1); + Assert.ThrowsExactly(() => + { + CreateMock(-1); + }); } [TestMethod] @@ -305,21 +309,25 @@ public void entityCollection_set_Item_normal_should_set_correct_item() } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void entityCollection_set_Item_invalid_index_should_raise_ArgumentOutOfRangeException() { - var target = CreateMock(); + Assert.ThrowsExactly(() => + { + var target = CreateMock(); - target[2] = new GenericParameterHelper(); + target[2] = new GenericParameterHelper(); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void entityCollection_get_Item_invalid_index_should_raise_ArgumentOutOfRangeException() { - var target = CreateMock(); + Assert.ThrowsExactly(() => + { + var target = CreateMock(); - var actual = target[2]; + var actual = target[2]; + }); } [TestMethod] @@ -383,12 +391,14 @@ public void entityCollection_addRange_normal_should_increment_count() } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void entityCollection_addRange_null_reference_should_raise_ArgumentNullException() { - var target = CreateMock(); + Assert.ThrowsExactly(() => + { + var target = CreateMock(); - target.AddRange(null); + target.AddRange(null); + }); } [TestMethod] @@ -427,28 +437,32 @@ public void entityCollection_copyTo_array_normal_should_copy_elements_to_given_a } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void entityCollection_copyTo_array_null_reference_destination_array_should_raise_ArgumentNullException() { - var target = CreateMock(); - target.Add(new GenericParameterHelper(0)); - target.Add(new GenericParameterHelper(1)); - target.Add(new GenericParameterHelper(2)); + Assert.ThrowsExactly(() => + { + var target = CreateMock(); + target.Add(new GenericParameterHelper(0)); + target.Add(new GenericParameterHelper(1)); + target.Add(new GenericParameterHelper(2)); - target.CopyTo(null); + target.CopyTo(null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentException))] public void entityCollection_copyTo_array_destination_array_smaller_then_source_should_raise_ArgumentException() { - var target = CreateMock(); - target.Add(new GenericParameterHelper(0)); - target.Add(new GenericParameterHelper(1)); - target.Add(new GenericParameterHelper(2)); - - var destination = new GenericParameterHelper[1]; - target.CopyTo(destination); + Assert.ThrowsExactly(() => + { + var target = CreateMock(); + target.Add(new GenericParameterHelper(0)); + target.Add(new GenericParameterHelper(1)); + target.Add(new GenericParameterHelper(2)); + + var destination = new GenericParameterHelper[1]; + target.CopyTo(destination); + }); } [TestMethod] diff --git a/src/Radical.Tests/Model/EntityView/EntityItemViewPropertyDescriptorTests.cs b/src/Radical.Tests/Model/EntityView/EntityItemViewPropertyDescriptorTests.cs index 22e030d6..426223b9 100644 --- a/src/Radical.Tests/Model/EntityView/EntityItemViewPropertyDescriptorTests.cs +++ b/src/Radical.Tests/Model/EntityView/EntityItemViewPropertyDescriptorTests.cs @@ -179,35 +179,43 @@ public void entityItemViewPropertyDescriptor_setValue_using_default_ctor_should_ } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void entityItemViewPropertyDescriptor_getValue_using_null_reference_component_should_raise_ArgumentNullException() { - var target = new EntityItemViewPropertyDescriptor("Data"); - target.GetValue(null); + Assert.ThrowsExactly(() => + { + var target = new EntityItemViewPropertyDescriptor("Data"); + target.GetValue(null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void entityItemViewPropertyDescriptor_setValue_using_null_reference_component_should_raise_ArgumentNullException() { - var target = new EntityItemViewPropertyDescriptor("Data"); - target.SetValue(null, 100); + Assert.ThrowsExactly(() => + { + var target = new EntityItemViewPropertyDescriptor("Data"); + target.SetValue(null, 100); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentException))] public void entityItemViewPropertyDescriptor_getValue_using_invalid_reference_component_should_raise_ArgumentException() { - var target = new EntityItemViewPropertyDescriptor("Data"); - target.GetValue(new object()); + Assert.ThrowsExactly(() => + { + var target = new EntityItemViewPropertyDescriptor("Data"); + target.GetValue(new object()); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentException))] public void entityItemViewPropertyDescriptor_setValue_using_invalid_reference_component_should_raise_ArgumentException() { - var target = new EntityItemViewPropertyDescriptor("Data"); - target.SetValue(new object(), 100); + Assert.ThrowsExactly(() => + { + var target = new EntityItemViewPropertyDescriptor("Data"); + target.SetValue(new object(), 100); + }); } } } diff --git a/src/Radical.Tests/Model/PredicateEntityItemViewFilterTest.cs b/src/Radical.Tests/Model/PredicateEntityItemViewFilterTest.cs index e2131553..ea5afb70 100644 --- a/src/Radical.Tests/Model/PredicateEntityItemViewFilterTest.cs +++ b/src/Radical.Tests/Model/PredicateEntityItemViewFilterTest.cs @@ -66,17 +66,21 @@ public void predicateEntityItemViewFilter_ctor_predicate_null_string_should_set_ } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void predicateEntityItemViewFilter_ctor_null_predicate_should_raise_ArgumentNullException() { - var target = new PredicateEntityItemViewFilter(null); + Assert.ThrowsExactly(() => + { + var target = new PredicateEntityItemViewFilter(null); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void predicateEntityItemViewFilter_ctor_null_predicate_null_string_should_raise_ArgumentNullException() { - var target = new PredicateEntityItemViewFilter(null, null); + Assert.ThrowsExactly(() => + { + var target = new PredicateEntityItemViewFilter(null, null); + }); } } } diff --git a/src/Radical.Tests/Model/PropertyValueChangeTest.cs b/src/Radical.Tests/Model/PropertyValueChangeTest.cs index 06081aec..54d95ebf 100644 --- a/src/Radical.Tests/Model/PropertyValueChangeTest.cs +++ b/src/Radical.Tests/Model/PropertyValueChangeTest.cs @@ -74,19 +74,23 @@ public void propertyValueChange_getAdvisedAction_should_return_expected_values() [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void propertyVaueChange_getAdvisedAction_using_invalid_owner_should_raise_ArgumentOutOfRangeException() { - var target = MockPropertyValue(new object(), "Foo", cv => { }); - target.GetAdvisedAction(new object()); + Assert.ThrowsExactly(() => + { + var target = MockPropertyValue(new object(), "Foo", cv => { }); + target.GetAdvisedAction(new object()); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void propertyVaueChange_getAdvisedAction_using_invalid_owner_should_raise_ArgumentNullException() { - var target = MockPropertyValue(new object(), "Foo", cv => { }); - target.GetAdvisedAction(null); + Assert.ThrowsExactly(() => + { + var target = MockPropertyValue(new object(), "Foo", cv => { }); + target.GetAdvisedAction(null); + }); } [TestMethod] diff --git a/src/Radical.Tests/Model/ViewAllEntityItemViewFilterTest.cs b/src/Radical.Tests/Model/ViewAllEntityItemViewFilterTest.cs index ed07ce57..5e70312a 100644 --- a/src/Radical.Tests/Model/ViewAllEntityItemViewFilterTest.cs +++ b/src/Radical.Tests/Model/ViewAllEntityItemViewFilterTest.cs @@ -36,11 +36,13 @@ public void viewAllEntityItemViewFilter_shouldInclude_should_always_return_true( } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void viewAllEntityItemViewFilter_shouldInclude_using_null_reference_should_raise_ArgumentNullException() { - var target = ViewAllEntityItemViewFilter.Instance; - ((ViewAllEntityItemViewFilter)target).ShouldInclude(null); + Assert.ThrowsExactly(() => + { + var target = ViewAllEntityItemViewFilter.Instance; + ((ViewAllEntityItemViewFilter)target).ShouldInclude(null); + }); } [TestMethod] diff --git a/src/Radical.Tests/Validation/ArrayEnsureExtensionTest.cs b/src/Radical.Tests/Validation/ArrayEnsureExtensionTest.cs index ad16a0a2..90c6112c 100644 --- a/src/Radical.Tests/Validation/ArrayEnsureExtensionTest.cs +++ b/src/Radical.Tests/Validation/ArrayEnsureExtensionTest.cs @@ -9,35 +9,43 @@ namespace Radical.Tests.Validation public class ArrayEnsureExtensionTest { [TestMethod()] - [ExpectedException(typeof(System.ArgumentOutOfRangeException))] public void arrayEnsureExtension_containsIndex_using_an_out_of_range_index_lower() { - int[] data = new int[1] { 0 }; - Ensure.That(data).ContainsIndex(-1); + Assert.ThrowsExactly(() => + { + int[] data = new int[1] { 0 }; + Ensure.That(data).ContainsIndex(-1); + }); } [TestMethod()] - [ExpectedException(typeof(System.ArgumentOutOfRangeException))] public void arrayEnsureExtension_containsIndex_using_an_out_of_range_index_lower_using_named_ensure() { - int[] data = new int[1] { 0 }; - Ensure.That(data).Named("foo").ContainsIndex(-1); + Assert.ThrowsExactly(() => + { + int[] data = new int[1] { 0 }; + Ensure.That(data).Named("foo").ContainsIndex(-1); + }); } [TestMethod()] - [ExpectedException(typeof(System.ArgumentOutOfRangeException))] public void arrayEnsureExtension_containsIndex_using_an_out_of_range_index_upper() { - int[] data = new int[1] { 0 }; - Ensure.That(data).ContainsIndex(2); + Assert.ThrowsExactly(() => + { + int[] data = new int[1] { 0 }; + Ensure.That(data).ContainsIndex(2); + }); } [TestMethod()] - [ExpectedException(typeof(System.ArgumentOutOfRangeException))] public void arrayEnsureExtension_containsIndex_using_an_out_of_range_index_upper_using_named_ensure() { - int[] data = new int[1] { 0 }; - Ensure.That(data).Named("foo").ContainsIndex(2); + Assert.ThrowsExactly(() => + { + int[] data = new int[1] { 0 }; + Ensure.That(data).Named("foo").ContainsIndex(2); + }); } [TestMethod()] diff --git a/src/Radical.Tests/Validation/ComparableEnsureExtensionTests.cs b/src/Radical.Tests/Validation/ComparableEnsureExtensionTests.cs index 81a7b8c4..5bd855b2 100644 --- a/src/Radical.Tests/Validation/ComparableEnsureExtensionTests.cs +++ b/src/Radical.Tests/Validation/ComparableEnsureExtensionTests.cs @@ -26,24 +26,30 @@ public void comparableEnsureExtension_isGreaterThen_Or_Equal_using_boundary_valu } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void comparableEnsureExtension_isGreaterThen_using_non_valid_value_should_raise_ArgumentOutOfRangeException() { - Ensure.That(10).IsGreaterThen(15); + Assert.ThrowsExactly(() => + { + Ensure.That(10).IsGreaterThen(15); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void comparableEnsureExtension_isGreaterThen_using_non_valid_boundary_value_should_raise_ArgumentOutOfRangeException() { - Ensure.That(10).IsGreaterThen(10); + Assert.ThrowsExactly(() => + { + Ensure.That(10).IsGreaterThen(10); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void comparableEnsureExtension_isGreaterThen_Or_Equal_using_non_valid_value_should_raise_ArgumentOutOfRangeException() { - Ensure.That(10).IsGreaterThen(11, Or.Equal); + Assert.ThrowsExactly(() => + { + Ensure.That(10).IsGreaterThen(11, Or.Equal); + }); } [TestMethod] @@ -53,10 +59,12 @@ public void comparableEnsureExtension_isWithin_using_valid_range_should_behave_a } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void comparableEnsureExtension_isWithin_using_value_out_of_range_should_raise_ArgumentOutOfRangeException() { - Ensure.That(100).IsWithin(8, 11); + Assert.ThrowsExactly(() => + { + Ensure.That(100).IsWithin(8, 11); + }); } [TestMethod] diff --git a/src/Radical.Tests/Validation/EnsureTests.cs b/src/Radical.Tests/Validation/EnsureTests.cs index 7d0b35ce..e96054b5 100644 --- a/src/Radical.Tests/Validation/EnsureTests.cs +++ b/src/Radical.Tests/Validation/EnsureTests.cs @@ -206,22 +206,26 @@ public void validator_inspect_isNotNull_after_then_value_name_with_true_state() } [TestMethod()] - [ExpectedException(typeof(System.ArgumentNullException))] public void validator_instpect_on_nullString_Throw() { - string expected = "null"; - Ensure.That((string)null).If(s => s == null) - .Then((val) => - { - throw new System.ArgumentNullException(expected); - }); + Assert.ThrowsExactly(() => + { + string expected = "null"; + Ensure.That((string)null).If(s => s == null) + .Then((val) => + { + throw new System.ArgumentNullException(expected); + }); + }); } [TestMethod()] - [ExpectedException(typeof(System.ArgumentNullException))] public void validator_instpect_on_nullString_exception() { - Ensure.That((string)null).IsNotNull(); + Assert.ThrowsExactly(() => + { + Ensure.That((string)null).IsNotNull(); + }); } [TestMethod()] diff --git a/src/Radical.Tests/Validation/GuidEnsureExtensionTest.cs b/src/Radical.Tests/Validation/GuidEnsureExtensionTest.cs index 971508e6..4065a094 100644 --- a/src/Radical.Tests/Validation/GuidEnsureExtensionTest.cs +++ b/src/Radical.Tests/Validation/GuidEnsureExtensionTest.cs @@ -16,11 +16,13 @@ public void guidEnsureExtension_isNotEmpty_using_non_empty_guid_should_behave_as } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void guidEnsureExtension_isNotEmpty_using_empty_guid_should_raise_ArgumentOutOfRangeException() { - var v = Ensure.That(Guid.Empty); - v.IsNotEmpty(); + Assert.ThrowsExactly(() => + { + var v = Ensure.That(Guid.Empty); + v.IsNotEmpty(); + }); } [TestMethod] diff --git a/src/Radical.Tests/Validation/StringEnsureExtensionTest.cs b/src/Radical.Tests/Validation/StringEnsureExtensionTest.cs index 2a8c81f1..789cccfa 100644 --- a/src/Radical.Tests/Validation/StringEnsureExtensionTest.cs +++ b/src/Radical.Tests/Validation/StringEnsureExtensionTest.cs @@ -9,10 +9,12 @@ namespace Radical.Tests.Validation public class StringValidatorTest { [TestMethod()] - [ExpectedException(typeof(System.ArgumentOutOfRangeException))] public void stringEnsureTest_IsNotEmpty() { - Ensure.That("").IsNotEmpty(); + Assert.ThrowsExactly(() => + { + Ensure.That("").IsNotEmpty(); + }); } [TestMethod()] @@ -38,19 +40,23 @@ public void stringEnsureExtension_isNotNullNorEmpty_with_valid_string_should_ret } [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] public void stringEnsureExtension_isNotNullNorEmpty_null_string_should_raise_ArgumentNullException() { - string value = null; - Ensure.That(value).IsNotNullNorEmpty(); + Assert.ThrowsExactly(() => + { + string value = null; + Ensure.That(value).IsNotNullNorEmpty(); + }); } [TestMethod] - [ExpectedException(typeof(ArgumentOutOfRangeException))] public void stringEnsureExtension_isNotNullNorEmpty_empty_string_should_raise_ArgumentOutOfRangeException() { - string value = string.Empty; - Ensure.That(value).IsNotNullNorEmpty(); + Assert.ThrowsExactly(() => + { + string value = string.Empty; + Ensure.That(value).IsNotNullNorEmpty(); + }); } [TestMethod] @@ -62,12 +68,14 @@ public void stringEnsureExtension_matches_using_valid_email_address_should_not_f } [TestMethod] - [ExpectedException(typeof(FormatException))] public void stringEnsureExtension_matches_using_non_valid_email_address_should_raise_FormatException() { - var pattern = Radical.Helpers.KnownRegex.MailAddress; + Assert.ThrowsExactly(() => + { + var pattern = Radical.Helpers.KnownRegex.MailAddress; - Ensure.That("name_domain.tld").Matches(pattern); + Ensure.That("name_domain.tld").Matches(pattern); + }); } [TestMethod]