Merge branch 'master-mssql-tests-fixup'

Author: alex-kulakov

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

@@ -185,8 +185,8 @@ public void UpdateWithReferenceToUpdatingEntity()
           var bar1 = new Bar(session) {Name = "Test"};
           var bar2 = new Bar(session);
           Assert.Throws<NotSupportedException>(()=>session.Query.All<Foo>().Set(a => a.Bar, a => session.Query.All<Bar>().First(b => b.Name==a.Name)).Update());
-          Assert.That(foo1.Bar, Is.EqualTo(bar1));
-          Assert.That(foo2.Bar, Is.EqualTo(bar2));
+          Assert.That(foo1.Bar, Is.Null);
+          Assert.That(foo2.Bar, Is.Null);
           Assert.That(foo3.Bar, Is.Null);
           trx.Complete();
         }

Orm/Xtensive.Orm.Manual/DomainAndSession/DomainAndSessionSample.cs

@@ -94,12 +94,13 @@ public void ConnectionStringTest()
     }
 
     [Test]
+    [Explicit("Needs MS SQL 2016 to be installed locally and also be available by localhost")]
     public void ConnectionStringInAppConfigTest()
     {
       #region Connection string in App.config sample
 
       // Creating new Domain configuration
-      var config = LoadDomainConfiguration("mssql2005cs");
+      var config = LoadDomainConfiguration("mssql2016cs");
       // Registering all types in the specified assembly and namespace
       config.Types.Register(typeof (Person).Assembly, typeof(Person).Namespace);
       // And finally building the domain

Orm/Xtensive.Orm.Manual/ModellingDomain/AuditAndOpenGenericsTest.cs

@@ -415,7 +415,7 @@ where typeInfo.IsAutoGenericInstance
       foreach (var typeInfo in autoGenericInstances)
         Console.WriteLine("  {0}", typeInfo.UnderlyingType.GetShortName());
       Console.WriteLine();
-      Assert.AreEqual(6, autoGenericInstances.Count);
+      Assert.AreEqual(8, autoGenericInstances.Count);
     }
 
     private void DumpAuditLog()

Orm/Xtensive.Orm.Tests/Issues/IssueJira0171_DateTimeOffset.cs

@@ -30,7 +30,7 @@ public class EntityWithDateTimeOffset : Entity
   [TestFixture]
   internal class IssueJira0171_DateTimeOffset : AutoBuildTest
   {
-    private DateTimeOffset today = new DateTimeOffset(2013, 11, 28, 16, 53, 0, 0, new TimeSpan(4, 10, 0));
+    private DateTimeOffset today = new DateTimeOffset(2018, 11, 28, 16, 53, 0, 0, new TimeSpan(4, 10, 0));
 
     protected override DomainConfiguration BuildConfiguration()
     {

Orm/Xtensive.Orm.Tests/Storage/EncryptedConnectionStringTest.cs

@@ -10,9 +10,10 @@
 namespace Xtensive.Orm.Tests.Storage
 {
   [TestFixture]
+  [Ignore("No such domain configuration for now")]
   public class EncryptedConnectionStringTest : HasConfigurationAccessTest
   {
-    [Test, Explicit]
+    [Test]
     public void MainTest()
     {
       var config = LoadDomainConfiguration("encrypted");

Orm/Xtensive.Orm.Tests/Storage/Modules/ModulesRegistrationTest.cs

@@ -14,7 +14,7 @@
 namespace Xtensive.Orm.Tests.Storage.Modules
 {
   [TestFixture, Category("Upgrade")]
-  [Explicit("Requires specific file path.")]
+  [Ignore(".Net Core 2 has no working CodeDomProvider. It appeared only in .Net Core 3")]
   public sealed class ModulesRegistrationTest
   {
     [OneTimeSetUp]
@@ -79,8 +79,7 @@ private Assembly CompileAssembly(int version, params int[] references)
       foreach (var reference in references)
         compilerParameters.ReferencedAssemblies.Add(GetModelAssemblyName(reference));
       compilerParameters.ReferencedAssemblies.Add("System.dll");
-      compilerParameters.ReferencedAssemblies
-        .Add(@"C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll");
+      compilerParameters.ReferencedAssemblies.Add(@"System.Core.dll");
       compilerParameters.ReferencedAssemblies.Add(@"C:\Program Files\PostSharp 1.0\PostSharp.Laos.dll");
       compilerParameters.ReferencedAssemblies.Add(@"C:\Program Files\PostSharp 1.0\PostSharp.Public.dll");
       compilerParameters.ReferencedAssemblies.Add("..\\..\\..\\Lib\\Xtensive.Core.dll");

Orm/Xtensive.Orm.Tests/Storage/Performance/DoCrudTest.cs

@@ -10,28 +10,45 @@
 
 namespace Xtensive.Orm.Tests.Storage.Performance
 {
-  public abstract class DoCrudTest : AutoBuildTest
+  [Explicit]
+  public sealed class DoCrudTest : AutoBuildTest
   {
     private const int BaseCount = 50000;
     private const int InsertCount = BaseCount;
     private const int EntitySetItemCount = 10;
 
     private bool warmup;
+    private bool firstTestRun = true;
     private int instanceCount;
     private int collectionCount;
 
-    protected abstract DomainConfiguration CreateConfiguration();
 
     protected override sealed DomainConfiguration BuildConfiguration()
     {
-      var config = CreateConfiguration();
+      var config = DomainConfigurationFactory.CreateForCrudTest(TestConfiguration.Instance.Storage);
       config.Sessions.Add(new SessionConfiguration("Default"));
       // config.Sessions.Default.CacheSize = BaseCount;
       config.Sessions.Default.CacheType = SessionCacheType.Infinite;
       config.Types.Register(typeof (Simplest).Assembly, typeof (Simplest).Namespace);
       return config;
     }
 
+    public override void TestFixtureSetUp()
+    {
+      firstTestRun = true;
+      base.TestFixtureSetUp();
+    }
+
+    [SetUp]
+    public void TestSetup()
+    {
+      if (!firstTestRun) {
+        firstTestRun = false;
+        return;
+      }
+      RebuildDomain();
+    }
+
     [Test]
     public void RegularTest()
     {
@@ -42,7 +59,6 @@ public void RegularTest()
     }
 
     [Test]
-    [Explicit]
     [Category("Profile")]
     public void ProfileTest()
     {
@@ -62,7 +78,6 @@ public void ProfileTest()
     }
 
     [Test]
-    [Explicit]
     [Category("Profile")]
     public void UpdatePerformanceTest()
     {
@@ -424,23 +439,22 @@ private void RseQueryTest(int count)
     private void CachedRseQueryTest(int count)
     {
       using (var session = Domain.OpenSession())
-      using (session.Activate()) {
-        using (var ts = session.OpenTransaction()) {
-          TestHelper.CollectGarbage();
-          var pKey = new Parameter<Tuple>();
-          var rs = Domain.Model.Types[typeof (Simplest)].Indexes.PrimaryIndex.GetQuery().Seek(() => pKey.Value);
-          using (new ParameterContext().Activate()) {
-            using (warmup ? null : new Measurement("Cached RSE query", count)) {
-              for (int i = 0; i < count; i++) {
-                pKey.Value = Tuple.Create((long) (i%instanceCount));
-                var es = rs.GetRecordSet(session).ToEntities<Simplest>(0);
-                foreach (var o in es) {
-                  // Doing nothing, just enumerate
-                }
+      using (session.Activate())
+      using (var ts = session.OpenTransaction()) {
+        TestHelper.CollectGarbage();
+        var pKey = new Parameter<Tuple>();
+        var rs = Domain.Model.Types[typeof (Simplest)].Indexes.PrimaryIndex.GetQuery().Seek(() => pKey.Value);
+        using (new ParameterContext().Activate()) {
+          using (warmup ? null : new Measurement("Cached RSE query", count)) {
+            for (int i = 0; i < count; i++) {
+              pKey.Value = Tuple.Create((long) (i%instanceCount));
+              var es = rs.GetRecordSet(session).ToEntities<Simplest>(0);
+              foreach (var o in es) {
+                // Doing nothing, just enumerate
               }
             }
-            ts.Complete();
           }
+          ts.Complete();
         }
       }
     }