Skip to content

Commit 3bcd0b4

Browse files
committed
GeneralTestBehavior: Error message check improved
1 parent 271b798 commit 3bcd0b4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Orm/Xtensive.Orm.Tests/Storage/GeneralBehaviorTest.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void AssignReferenceToRemovedEntityTest()
8787
var customer = new Customer();
8888
customer.Remove();
8989
var order = new Order();
90-
AssertEntityRemovalHasBeenDetected(() => order.Customer = customer);
90+
AssertEntityRemovalHasBeenDetected(() => order.Customer = customer, nameof(Customer));
9191
tx.Complete();
9292
}
9393
}
@@ -99,7 +99,7 @@ public void UseRemovedEntityAsKeyForOtherEntityTest()
9999
using (var tx = session.OpenTransaction()) {
100100
var customer = new Customer();
101101
customer.Remove();
102-
AssertEntityRemovalHasBeenDetected(() => new CustomerOrder(1, customer));
102+
AssertEntityRemovalHasBeenDetected(() => new CustomerOrder(1, customer), nameof(Customer));
103103
tx.Complete();
104104
}
105105
}
@@ -112,7 +112,7 @@ public void AddRemovedEntityToEntitySetTest()
112112
var customer = new Customer();
113113
var order = new Order();
114114
order.Remove();
115-
AssertEntityRemovalHasBeenDetected(() => customer.Orders.Add(order));
115+
AssertEntityRemovalHasBeenDetected(() => customer.Orders.Add(order), nameof(Order));
116116
tx.Complete();
117117
}
118118
}
@@ -125,7 +125,7 @@ public void RemoveRemovedEntityFromEntitySetTest()
125125
var customer = new Customer();
126126
var order = new Order();
127127
order.Remove();
128-
AssertEntityRemovalHasBeenDetected(() => customer.Orders.Remove(order));
128+
AssertEntityRemovalHasBeenDetected(() => customer.Orders.Remove(order), nameof(Order));
129129
tx.Complete();
130130
}
131131
}
@@ -138,18 +138,18 @@ public void CallContainsOnEntitySetForRemovedEntityTest()
138138
var customer = new Customer();
139139
var order = new Order();
140140
order.Remove();
141-
AssertEntityRemovalHasBeenDetected(() => customer.Orders.Contains(order));
141+
AssertEntityRemovalHasBeenDetected(() => customer.Orders.Contains(order), nameof(Order));
142142
tx.Complete();
143143
}
144144
}
145145

146-
private static void AssertEntityRemovalHasBeenDetected(Action action)
146+
private static void AssertEntityRemovalHasBeenDetected(Action action, string removedTypeName)
147147
{
148148
try {
149149
action.Invoke();
150150
}
151151
catch (InvalidOperationException e) {
152-
Assert.AreEqual(string.Format(Strings.ExEntityOfTypeXIsRemoved, nameof(Order)), e.Message);
152+
Assert.AreEqual(string.Format(Strings.ExEntityOfTypeXIsRemoved, removedTypeName), e.Message);
153153
}
154154
}
155155
}

0 commit comments

Comments
 (0)