Rename Cloner.Clone() to reflect the way it clones objects

Author: alex-kulakov

Orm/Xtensive.Orm.Manual/Concurrency/VersionsTest.cs

@@ -240,7 +240,7 @@ public void VersionValidatorTest()
         }
 
         // Let's clone VersionSet (actually - serialize & deserialize)
-        versions = Cloner.Clone(versions);
+        versions = Cloner.CloneViaBinarySerialization(versions);
         // And dump it
         Dump(versions);
 

Orm/Xtensive.Orm.Tests.Core/Comparison/ComparerProviderTests.cs

@@ -56,7 +56,7 @@ private void SerializationTest<T>()
     {
       var comparer = AdvancedComparer<T>.Default;
       Assert.That(comparer.Compare, Is.Not.Null);
-      var deserializedComparer = Cloner.Clone(comparer);
+      var deserializedComparer = Cloner.CloneViaBinarySerialization(comparer);
       Assert.That(deserializedComparer.Compare, Is.Not.Null);
     }
 

Orm/Xtensive.Orm.Tests.Core/Modelling/DatabaseModelTest.cs

@@ -70,7 +70,7 @@ public void Setup()
     [Ignore("TODO: AY check it ASAP")]
     public void SerializationTest()
     {
-      var clone = Cloner.Clone(srv);
+      var clone = Cloner.CloneViaBinarySerialization(srv);
 //      clone.Dump();
       clone.Validate();
     }

Orm/Xtensive.Orm.Tests.Core/Tuples/LongTupleTest.cs

@@ -44,7 +44,7 @@ public void CombinedTest()
           for (int j = 0; j < count; j++)
             Assert.That(tuple.GetValue(j), Is.EqualTo(data[j]));
           // Testing serialization 
-          var tuple2 = Cloner.Clone(tuple);
+          var tuple2 = Cloner.CloneViaBinarySerialization(tuple);
           Assert.That(tuple2, Is.EqualTo(tuple));
           Assert.That(tuple2.Descriptor, Is.EqualTo(tuple.Descriptor));
           // Testing reads (untyped));

Orm/Xtensive.Orm.Tests.Core/Tuples/TupleSerializationTest.cs

@@ -54,7 +54,7 @@ public void DifferentialTupleSerializationTest()
       dt1.SetValue(1,4);
       var all = new[] {dt1, dt2};
 
-      var clone = Cloner.Clone(all);
+      var clone = Cloner.CloneViaBinarySerialization(all);
       AssertEx.HasSameElements(all, clone);
 
       var dt1Clone = clone[0];
@@ -68,7 +68,7 @@ public void DifferentialTupleSerializationTest()
 
     private static Tuple CloneBySerialization(Tuple source)
     {
-      return Cloner.Clone(source);
+      return Cloner.CloneViaBinarySerialization(source);
     }
   }
 }

Orm/Xtensive.Orm.Tests.Framework/Cloner.cs

@@ -18,11 +18,10 @@ public static class Cloner
     private static readonly IFormatter Formatter = new BinaryFormatter();
 
     /// <summary>
-    /// Clones the <paramref name="source"/> using 
-    /// provided <see cref="Formatter"/>.
+    /// Clones the <paramref name="source"/> using <see cref="BinaryFormatter"/>.
     /// </summary>
     /// <param name="source">The source to clone.</param>
-    public static T Clone<T>(T source)
+    public static T CloneViaBinarySerialization<T>(T source)
     {
       using (var stream = new MemoryStream()) {
         Formatter.Serialize(stream, source);

Orm/Xtensive.Orm.Tests/Model/VersionInfoTest.cs

@@ -130,8 +130,6 @@ public class SimpleStructure : Structure
 
 namespace Xtensive.Orm.Tests.Model
 {
-  
-
   [TestFixture]
   public class VersionInfoTest
   {
@@ -166,37 +164,40 @@ public void DenyLazyLoadFieldsTest()
     [Test]
     public void VersionFieldsTest()
     {
-      var domain = BuildDomain("Xtensive.Orm.Tests.Model.VersionInfoTests.ValidModel");
+      using var domain = BuildDomain("Xtensive.Orm.Tests.Model.VersionInfoTests.ValidModel");
       var model = domain.Model;
 
       var parentType = model.Types[typeof (Parent)];
-      Assert.That(parentType.GetVersionFields().Any(field => field==parentType.Fields["ParentVersionField"]), Is.True);
-      Assert.That(parentType.GetVersionFields().Any(field => field==parentType.Fields["ParentNonVersionField"]), Is.False);
+      var versionFields = parentType.GetVersionFields();
+      Assert.That(versionFields.Any(field => field == parentType.Fields["ParentVersionField"]), Is.True);
+      Assert.That(versionFields.Any(field => field == parentType.Fields["ParentNonVersionField"]), Is.False);
 
       var childType = model.Types[typeof (Child)];
-      Assert.That(childType.GetVersionFields().Any(field => field==childType.Fields["ParentVersionField"]), Is.True);
-      Assert.That(childType.GetVersionFields().Any(field => field==childType.Fields["ParentNonVersionField"]), Is.False);
-      Assert.That(childType.GetVersionFields().Any(field => field==childType.Fields["ChildNonVersionField"]), Is.False);
+      versionFields = childType.GetVersionFields();
+      Assert.That(versionFields.Any(field => field == childType.Fields["ParentVersionField"]), Is.True);
+      Assert.That(versionFields.Any(field => field == childType.Fields["ParentNonVersionField"]), Is.False);
+      Assert.That(versionFields.Any(field => field == childType.Fields["ChildNonVersionField"]), Is.False);
 
       var simpleType = model.Types[typeof (Simple)];
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["NonLazyField1"]), Is.True);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["NonLazyField2"]), Is.True);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["ReferenceField.Id"]), Is.True);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["Id"]), Is.False);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["TypeId"]), Is.False);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["LazyField"]), Is.False);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["CollectionField"]), Is.False);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["StructureField"]), Is.False);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["StructureField.NonLazyField"]), Is.True);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["StructureField.LazyField"]), Is.False);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["StructureField.ReferenceField.Id"]), Is.True);
-      Assert.That(simpleType.GetVersionColumns().Any(pair => pair.Field==simpleType.Fields["ByteArrayField"]), Is.False);
+      var versionColumns = simpleType.GetVersionColumns();
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["NonLazyField1"]), Is.True);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["NonLazyField2"]), Is.True);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["ReferenceField.Id"]), Is.True);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["Id"]), Is.False);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["TypeId"]), Is.False);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["LazyField"]), Is.False);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["CollectionField"]), Is.False);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["StructureField"]), Is.False);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["StructureField.NonLazyField"]), Is.True);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["StructureField.LazyField"]), Is.False);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["StructureField.ReferenceField.Id"]), Is.True);
+      Assert.That(versionColumns.Any(pair => pair.Field == simpleType.Fields["ByteArrayField"]), Is.False);
     }
 
     [Test]
     public void SerializeVersionInfoTest()
     {
-      var domain = BuildDomain("Xtensive.Orm.Tests.Model.VersionInfoTests.ValidModel");
+      using var domain = BuildDomain("Xtensive.Orm.Tests.Model.VersionInfoTests.ValidModel");
       VersionInfo version;
 
       using (var session = domain.OpenSession()) {
@@ -212,7 +213,7 @@ public void SerializeVersionInfoTest()
       }
 
       Assert.That(version.IsVoid, Is.False);
-      var versionClone = Cloner.Clone(version);
+      var versionClone = Cloner.CloneViaBinarySerialization(version);
       Assert.That(versionClone.IsVoid, Is.False);
       Assert.That(versionClone, Is.EqualTo(version));
     }

Orm/Xtensive.Orm.Tests/Storage/RefTest.cs

@@ -25,7 +25,7 @@ public class RefTest : AutoBuildTest
     protected override DomainConfiguration BuildConfiguration()
     {
       var config = base.BuildConfiguration();
-      config.Types.RegisterCaching(typeof (Author).Assembly, typeof (Author).Namespace);
+      config.Types.Register(typeof (Author));
       return config;
     }
 
@@ -43,7 +43,7 @@ public void CombinedTest()
         tx.Complete();
       }
 
-      authorRef = Cloner.Clone(authorRef);
+      authorRef = Cloner.CloneViaBinarySerialization(authorRef);
 
       using (var session = Domain.OpenSession())
       using (var tx = session.OpenTransaction()) {

Orm/Xtensive.Orm.Tests/Storage/SerializedQueryTest.cs

@@ -33,7 +33,7 @@ public void CombinedTest()
         .Skip(0);
 
       var serializableExpression = query.Expression.ToSerializableExpression();
-      var serializedExpression = Cloner.Clone(serializableExpression);
+      var serializedExpression = Cloner.CloneViaBinarySerialization(serializableExpression);
 
       var deserializedExpression = serializedExpression.ToExpression();
       var deserializedQuery = new Queryable<MediaType>((QueryProvider) query.Provider, deserializedExpression);

Orm/Xtensive.Orm.Tests/Storage/UpdateVersionTest.cs

@@ -10,7 +10,8 @@
 using Xtensive.Core;
 using Xtensive.Orm.Configuration;
 using System.Linq;
-using M=Xtensive.Orm.Model;
+using M = Xtensive.Orm.Model;
+using Xtensive.Orm.Tests.Storage.VersionModel;
 
 #region Model
 
@@ -231,8 +232,6 @@ public class ItemWithAutoVersions : Entity
 
 namespace Xtensive.Orm.Tests.Storage
 {
-  using VersionModel;
-
   [TestFixture]
   public class UpdateVersionTest : AutoBuildTest
   {
@@ -521,7 +520,7 @@ public void SerializeVersionInfoTest()
         }
       }
       Assert.That(versionInfo.IsVoid, Is.False);
-      var clone = Cloner.Clone(versionInfo);
+      var clone = Cloner.CloneViaBinarySerialization(versionInfo);
       Assert.That(clone.IsVoid, Is.False);
       Assert.That(versionInfo==clone, Is.True);
     }