Merge pull request #349 from DataObjects-NET/6.0-improve-error-message

Improves error message when entity is removed

Author: alex-kulakov

ChangeLog/6.0.12_dev.txt

@@ -1,4 +1,5 @@
 [main] Addressed DataTypeCollection.Add method issue of wrong adding storage-specifid types to the collection
 [main] Addressed rare issue of entities expire management when SessionOption.NonTransactionalReads is on
 [main] Fixed issue of skipping persist or query tasks during batching
+[main] Improved error message when the entity user operates with is removed, now it contains type of entity
 [sqlserver] Sql error messages for British English are correctly parsed

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

@@ -149,7 +149,7 @@ private static void AssertEntityRemovalHasBeenDetected(Action action)
         action.Invoke();
       }
       catch (InvalidOperationException e) {
-        Assert.AreEqual(Strings.ExEntityIsRemoved, e.Message);
+        Assert.AreEqual(string.Format(Strings.ExEntityOfTypeXIsRemoved, nameof(Order)), e.Message);
       }
     }
   }

Orm/Xtensive.Orm/Orm/Entity.cs

@@ -417,7 +417,7 @@ internal void RemoveInternal(EntityRemoveReason reason)
     internal void EnsureNotRemoved()
     {
       if (IsRemoved)
-        throw new InvalidOperationException(Strings.ExEntityIsRemoved);
+        throw new InvalidOperationException(string.Format(Strings.ExEntityOfTypeXIsRemoved, TypeInfo.Name));
     }
 
     internal override sealed ValidationResult GetValidationResult()

Orm/Xtensive.Orm/Orm/EntitySetBase.cs

@@ -154,7 +154,7 @@ public bool Contains(Key key)
     protected void EnsureOwnerIsNotRemoved()
     {
       if (Owner.IsRemoved) {
-        throw new InvalidOperationException(Strings.ExEntityIsRemoved);
+        throw new InvalidOperationException(string.Format(Strings.ExEntityOfTypeXIsRemoved, Owner.TypeInfo.Name));
       }
     }
 

Orm/Xtensive.Orm/Orm/Structure.cs

@@ -339,12 +339,12 @@ private bool InnerEquals(Structure other, bool thisIsBound, bool otherIsBound)
       if (thisIsBound) {
         EnsureIsFetched(Field);
         if (Entity.IsRemoved && !Session.Configuration.Supports(SessionOptions.ReadRemovedObjects))
-          throw new InvalidOperationException(Strings.ExEntityIsRemoved);
+          throw new InvalidOperationException(string.Format(Strings.ExEntityOfTypeXIsRemoved, Entity.TypeInfo.Name));
       }
       if (otherIsBound) {
         other.EnsureIsFetched(other.Field);
         if (other.Entity.IsRemoved && !Session.Configuration.Supports(SessionOptions.ReadRemovedObjects))
-          throw new InvalidOperationException(Strings.ExEntityIsRemoved);
+          throw new InvalidOperationException(string.Format(Strings.ExEntityOfTypeXIsRemoved, other.Entity.TypeInfo.Name));
       }
       return Equals(Tuple, other.Tuple);
     }

Orm/Xtensive.Orm/Strings.Designer.cs

@@ -1172,8 +1172,8 @@
   <data name="ValueCanNotBeNull" xml:space="preserve">
     <value>Value can not be null.</value>
   </data>
-  <data name="ExEntityIsRemoved" xml:space="preserve">
-    <value>Entity is removed.</value>
+  <data name="ExEntityOfTypeXIsRemoved" xml:space="preserve">
+    <value>Entity of type '{0}' is removed.</value>
   </data>
   <data name="ValueLengthCanNotExceedX" xml:space="preserve">
     <value>Value can not exceed {0}.</value>