Minor changes of test classes

Test renames, some test structure improvements

Author: alex-kulakov

Extensions/Xtensive.Orm.BulkOperations.Tests/Other.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -244,7 +244,7 @@ public void In()
     }
 
     [Test]
-    public void InWithCombinationWithFieldUsageinUpdate()
+    public void InWithCombinationWithFieldUsageUpdate()
     {
       using (Session session = Domain.OpenSession())
       using (TransactionScope trx = session.OpenTransaction()) {

Orm/Xtensive.Orm.Tests/Issues/IssueJira0793_FieldValidationTriggersLazyLoadFieldsFetch.cs

@@ -70,45 +70,39 @@ public class Chapter : Entity
     [NotNullOrEmptyConstraint(ValidateOnlyIfModified = true)]// should validate only if changed
     public string Description { get; set; }
   }
-}
 
-namespace Xtensive.Orm.Tests.Issues
-{
-  public class IssueJira0793_FieldValidationTriggersLazyLoadFieldsFetch : AutoBuildTest
+  public class QueryCounter
   {
-    private class QueryCounter
-    {
-      public int Count { get; private set; }
+    public int Count { get; private set; }
 
-      public Disposable Attach(Session session)
-      {
-        session.Events.DbCommandExecuted += Encount;
-        return new Disposable((disposing) => session.Events.DbCommandExecuted -= Encount);
-      }
+    public Disposable Attach(Session session)
+    {
+      session.Events.DbCommandExecuted += Encount;
+      return new Disposable((disposing) => session.Events.DbCommandExecuted -= Encount);
+    }
 
-      public void Reset()
-      {
-        Count = 0;
-      }
+    public void Reset() => Count = 0;
 
-      private void Encount(object sender, DbCommandEventArgs eventArgs)
-      {
-        Count++;
-      }
+    private void Encount(object sender, DbCommandEventArgs eventArgs) => Count++;
 
-      public QueryCounter()
-      {
-        Count = 0;
-      }
+    public QueryCounter()
+    {
+      Count = 0;
     }
+  }
+}
 
+namespace Xtensive.Orm.Tests.Issues
+{
+  public class IssueJira0793_FieldValidationTriggersLazyLoadFieldsFetch : AutoBuildTest
+  {
     private Key oblomovKey;
     private Key goncharovKey;
 
     protected override DomainConfiguration BuildConfiguration()
     {
       var configuration = base.BuildConfiguration();
-      configuration.Types.Register(typeof (Book).Assembly, typeof (Book).Namespace);
+      configuration.Types.Register(typeof(Book).Assembly, typeof(Book).Namespace);
       configuration.UpgradeMode = DomainUpgradeMode.Recreate;
       return configuration;
     }
@@ -117,10 +111,13 @@ protected override void PopulateData()
     {
       using (var session = Domain.OpenSession())
       using (var transaction = session.OpenTransaction()) {
-        var author = new Author() { FirstName = "Ivan", LastName = "Goncharov", Biography = "Some biography of Ivan Alexandrovich" };
+        var author = new Author() {
+          FirstName = "Ivan",
+          LastName = "Goncharov",
+          Biography = "Some biography of Ivan Alexandrovich" };
         var book = new Book() {
           Title = "Oblomov",
-          Description = "A drama story of how human lazyness and absence of strenght within may cause his life.",
+          Description = "A drama about how human's lazyness and absence of strenght may affect his life.",
           BookFile = new byte[] { 3, 3, 3, 3, 3, 3, 3 },
           Author = author
         };
@@ -139,14 +136,13 @@ protected override void PopulateData()
     [Test]
     public void LazyFieldHasNoConstraintTest()
     {
+      var counter = new QueryCounter();
       using (var session = Domain.OpenSession()) {
-        var counter = new QueryCounter();
-        using (counter.Attach(session)) {
-          using (var transaction = session.OpenTransaction()) {
-            var oblomov = session.Query.Single<Book>(oblomovKey);
-            oblomov.Title = "Oblomov by Goncharov";
-            transaction.Complete();
-          }
+        using (counter.Attach(session))
+        using (var transaction = session.OpenTransaction()) {
+          var oblomov = session.Query.Single<Book>(oblomovKey);
+          oblomov.Title = "Oblomov by Goncharov";
+          transaction.Complete();
         }
         Assert.That(counter.Count, Is.EqualTo(2));
         counter.Reset();
@@ -156,14 +152,13 @@ public void LazyFieldHasNoConstraintTest()
     [Test]
     public void LazyFieldHasCheckAlwaysConstraintTest()
     {
+      var counter = new QueryCounter();
       using (var session = Domain.OpenSession()) {
-        var counter = new QueryCounter();
-        using (counter.Attach(session)) {
-          using (var transaction = session.OpenTransaction()) {
-            var goncharov = session.Query.Single<Author>(goncharovKey);
-            goncharov.FirstName = goncharov.FirstName + "modified"; // should prefetch lazy load field
-            transaction.Complete();
-          }
+        using (counter.Attach(session))
+        using (var transaction = session.OpenTransaction()) {
+          var goncharov = session.Query.Single<Author>(goncharovKey);
+          goncharov.FirstName = goncharov.FirstName + "modified"; // should prefetch lazy load field
+          transaction.Complete();
         }
         Assert.That(counter.Count, Is.EqualTo(3));
         counter.Reset();
@@ -173,34 +168,31 @@ public void LazyFieldHasCheckAlwaysConstraintTest()
     [Test]
     public void LazyFieldHasCheckIfModifiedConstraintTest()
     {
+      var counter = new QueryCounter();
       using (var session = Domain.OpenSession()) {
-        var counter = new QueryCounter();
-        using (counter.Attach(session)) {
-          using (var transaction = session.OpenTransaction()) {
-            foreach (var chapter in session.Query.All<Chapter>()) {
-              chapter.Title = chapter.Title + " modified";
-            }
-            transaction.Complete();
+        using (counter.Attach(session))
+        using (var transaction = session.OpenTransaction()) {
+          foreach (var chapter in session.Query.All<Chapter>()) {
+            chapter.Title = chapter.Title + " modified";
           }
-          Assert.That(counter.Count, Is.EqualTo(2));
-          counter.Reset();
+          transaction.Complete();
         }
+        Assert.That(counter.Count, Is.EqualTo(2));
+        counter.Reset();
       }
 
       using (var session = Domain.OpenSession()) {
-        var counter = new QueryCounter();
-        using (counter.Attach(session)) {
-          int updatedItems = 0;
-          using (var transaction = session.OpenTransaction()) {
-            foreach(var chapter in session.Query.All<Chapter>()) {
-              chapter.Description = chapter.Description + " modified";
-              updatedItems++;
-            }
-            transaction.Complete();
+        int updatedItems = 0;
+        using (counter.Attach(session))
+        using (var transaction = session.OpenTransaction()) {
+          foreach(var chapter in session.Query.All<Chapter>()) {
+            chapter.Description = chapter.Description + " modified";
+            updatedItems++;
           }
-          Assert.That(counter.Count, Is.EqualTo(5)); // query + fetches + update
-          counter.Reset();
+          transaction.Complete();
         }
+        Assert.That(counter.Count, Is.EqualTo(5)); // query + fetches + update
+        counter.Reset();
       }
     }
   }