Tests: Removed a bunch of duplicate code for Linq tests.

Author: patearl

src/NHibernate.Test/Linq/ReadonlyTestCase.cs

@@ -11,257 +11,25 @@
 
 namespace NHibernate.Test.Linq
 {
-    public abstract class ReadonlyTestCase
+    public abstract class ReadonlyTestCase : TestCase
     {
-    	protected Configuration _cfg;
-        protected ISessionFactoryImplementor _sessions;
-
-        private static readonly ILog log = LogManager.GetLogger(typeof(TestCase));
-
-        protected Dialect.Dialect Dialect
-        {
-            get { return NHibernate.Dialect.Dialect.GetDialect(_cfg.Properties); }
-        }
-
-    	protected TestDialect TestDialect
-    	{
-			get { return TestDialect.GetTestDialect(Dialect); }
-    	}
-
-        /// <summary>
-        /// To use in in-line test
-        /// </summary>
-        protected bool IsClassicParser
-        {
-            get
-            {
-                return _sessions.Settings.QueryTranslatorFactory is ClassicQueryTranslatorFactory;
-            }
-        }
-
-        /// <summary>
-        /// To use in in-line test
-        /// </summary>
-        protected bool IsAntlrParser
-        {
-            get
-            {
-                return _sessions.Settings.QueryTranslatorFactory is ASTQueryTranslatorFactory;
-            }
-        }
-
-        protected ISession lastOpenedSession;
-        private DebugConnectionProvider connectionProvider;
-
-        /// <summary>
-        /// Mapping files used in the TestCase
-        /// </summary>
-        protected abstract IList Mappings { get; }
-
-        /// <summary>
-        /// Assembly to load mapping files from (default is NHibernate.DomainModel).
-        /// </summary>
-        protected virtual string MappingsAssembly
-        {
-            get { return "NHibernate.DomainModel"; }
-        }
-
-        static ReadonlyTestCase()
-        {
-            // Configure log4net here since configuration through an attribute doesn't always work.
-            XmlConfigurator.Configure();
-        }
-
-        /// <summary>
-        /// Creates the tables used in this TestCase
-        /// </summary>
-        [TestFixtureSetUp]
-        public void TestFixtureSetUp()
-        {
-					try
-					{
-						Configure();
-						if (!AppliesTo(Dialect))
-						{
-							Assert.Ignore(GetType() + " does not apply to " + Dialect);
-						}
-
-						BuildSessionFactory();
-
-						if (!AppliesTo(_sessions))
-						{
-							Cleanup();
-							Assert.Ignore(GetType() + " does not apply with the current session-factory configuration");
-						}
-
-						OnFixtureSetup();
-					}
-					catch (Exception e)
-					{
-						log.Error("Error while setting up the test fixture", e);
-						throw;
-					}
-        }
-
-        /// <summary>
-        /// Removes the tables used in this TestCase.
-        /// </summary>
-        /// <remarks>
-        /// If the tables are not cleaned up sometimes SchemaExport runs into
-        /// Sql errors because it can't drop tables because of the FKs.  This 
-        /// will occur if the TestCase does not have the same hbm.xml files
-        /// included as a previous one.
-        /// </remarks>
-        [TestFixtureTearDown]
-        public void TestFixtureTearDown()
+        protected override void CreateSchema()
         {
-            OnFixtureTeardown();
-
-            Cleanup();
         }
 
-        protected virtual void OnFixtureSetup()
+        protected override void DropSchema()
         {
         }
 
-        protected virtual void OnFixtureTeardown()
+        protected override bool CheckDatabaseWasCleaned()
         {
-        }
-
-        protected virtual void OnSetUp()
-        {
-        }
-
-        /// <summary>
-        /// Set up the test. This method is not overridable, but it calls
-        /// <see cref="OnSetUp" /> which is.
-        /// </summary>
-        [SetUp]
-        public void SetUp()
-        {
-            OnSetUp();
-        }
-
-        protected virtual void OnTearDown()
-        {
-        }
-
-        /// <summary>
-        /// Checks that the test case cleans up after itself. This method
-        /// is not overridable, but it calls <see cref="OnTearDown" /> which is.
-        /// </summary>
-        [TearDown]
-        public void TearDown()
-        {
-            OnTearDown();
-
-            bool wasClosed = CheckSessionWasClosed();
-            bool wereConnectionsClosed = CheckConnectionsWereClosed();
-            bool fail = !wasClosed || !wereConnectionsClosed;
-
-            if (fail)
-            {
-                Assert.Fail("Test didn't clean up after itself. session closed: " + wasClosed + " connection closed: " + wereConnectionsClosed);
-            }
-        }
-
-        private bool CheckSessionWasClosed()
-        {
-            if (lastOpenedSession != null && lastOpenedSession.IsOpen)
-            {
-                log.Error("Test case didn't close a session, closing");
-                lastOpenedSession.Close();
-                return false;
-            }
-
+            // We are read-only, so we're theoretically always clean.
             return true;
         }
 
-        private bool CheckConnectionsWereClosed()
+        protected override void ApplyCacheSettings(Configuration configuration)
         {
-            if (connectionProvider == null || !connectionProvider.HasOpenConnections)
-            {
-                return true;
-            }
-
-            log.Error("Test case didn't close all open connections, closing");
-            connectionProvider.CloseAllConnections();
-            return false;
+            // Patrick Earl: I wasn't sure if making this do nothing was important, but I left it here since it wasn't running in the code when I changed it.
         }
-
-        private void Configure()
-        {
-            _cfg = new Configuration();
-            if (TestConfigurationHelper.hibernateConfigFile != null)
-                _cfg.Configure(TestConfigurationHelper.hibernateConfigFile);
-
-            Assembly assembly = Assembly.Load(MappingsAssembly);
-
-            foreach (string file in Mappings)
-            {
-                _cfg.AddResource(MappingsAssembly + "." + file, assembly);
-            }
-
-            Configure(_cfg);
-        }
-
-        protected virtual void BuildSessionFactory()
-        {
-            _sessions = (ISessionFactoryImplementor)_cfg.BuildSessionFactory();
-            connectionProvider = _sessions.ConnectionProvider as DebugConnectionProvider;
-        }
-
-        private void Cleanup()
-        {
-            if (_sessions != null)
-            {
-                _sessions.Close();
-            }
-            _sessions = null;
-            connectionProvider = null;
-            lastOpenedSession = null;
-            _cfg = null;
-        }
-
-        protected ISessionFactoryImplementor Sfi
-        {
-            get { return _sessions; }
-        }
-
-        protected virtual ISession OpenSession()
-        {
-            lastOpenedSession = _sessions.OpenSession();
-            return lastOpenedSession;
-        }
-
-        protected virtual ISession OpenSession(IInterceptor sessionLocalInterceptor)
-        {
-            lastOpenedSession = _sessions.OpenSession(sessionLocalInterceptor);
-            return lastOpenedSession;
-        }
-
-        #region Properties overridable by subclasses
-
-        protected virtual bool AppliesTo(Dialect.Dialect dialect)
-        {
-            return true;
-        }
-
-        protected virtual bool AppliesTo(ISessionFactoryImplementor factory)
-        {
-            return true;
-        }
-
-        protected virtual void Configure(Configuration configuration)
-        {
-        }
-
-        protected virtual string CacheConcurrencyStrategy
-        {
-            get { return "nonstrict-read-write"; }
-            //get { return null; }
-        }
-
-        #endregion        
     }
 }

src/NHibernate.Test/TestCase.cs

@@ -191,7 +191,7 @@ private bool CheckSessionWasClosed()
 			return true;
 		}
 
-		private bool CheckDatabaseWasCleaned()
+		protected virtual bool CheckDatabaseWasCleaned()
 		{
 			if (sessions.GetAllClassMetadata().Count == 0)
 			{
@@ -255,7 +255,7 @@ protected virtual void CreateSchema()
 			new SchemaExport(cfg).Create(OutputDdl, true);
 		}
 
-		private void DropSchema()
+		protected virtual void DropSchema()
 		{
 			new SchemaExport(cfg).Drop(OutputDdl, true);
 		}
@@ -337,7 +337,7 @@ protected virtual ISession OpenSession(IInterceptor sessionLocalInterceptor)
 			return lastOpenedSession;
 		}
 
-		protected void ApplyCacheSettings(Configuration configuration)
+		protected virtual void ApplyCacheSettings(Configuration configuration)
 		{
 			if (CacheConcurrencyStrategy == null)
 			{