Refactoring in tests:

- tests now use second-level cache by default. Nonstrict-read-write concurrency strategy is set to all classes and collections used in a test.
- The default cache concurrency strategy can be overridden (TestCase.CacheConcurrencyStrategy property).
- TestCase.dialect was made static and renamed to Dialect.

Fixed a few minor bugs related to caching.

SVN: trunk@2686

Author: Sergey Koshcheyev

src/NHibernate.DomainModel/CustomPersister.cs

@@ -387,6 +387,11 @@ public ISessionFactoryImplementor Factory
 			get { return factory; }
 		}
 
+		public bool IsInstance(object entity)
+		{
+			return entity is Custom;
+		}
+
 		#endregion
 	}
 }

src/NHibernate.Test/CacheTest/QueryCacheFixture.cs

@@ -44,7 +44,7 @@ public void QueryCacheWithNullParameters()
 				// Run a second time, just to test the query cache
 				object result = s
 					.CreateQuery("from Simple s where s = :s or s.Name = :name or s.Address = :address")
-					.SetEntity("s", simple)
+					.SetEntity("s", s.Load(typeof(Simple), 1L))
 					.SetString("name", null)
 					.SetString("address", null)
 					.SetCacheable(true)

src/NHibernate.Test/FilterTest/DynamicFilterTest.cs

@@ -489,27 +489,6 @@ protected override IList Mappings
 			}
 		}
 
-		protected override void Configure(Configuration cfg)
-		{
-			cfg.SetProperty(Environment.MaxFetchDepth, "1");
-			//		cfg.setProperty( Environment.MAX_FETCH_DEPTH, "2" );
-			//cfg.SetProperty(Environment.GenerateStatistics, "true");
-			cfg.SetProperty(Environment.UseQueryCache, "true");
-
-			foreach (PersistentClass clazz in cfg.ClassMappings)
-			{
-				if (!clazz.IsInherited)
-				{
-					cfg.SetCacheConcurrencyStrategy(clazz.MappedClass, "nonstrict-read-write");
-				}
-			}
-
-			foreach (Mapping.Collection coll in cfg.CollectionMappings)
-			{
-				cfg.SetCacheConcurrencyStrategy(coll.Role, "nonstrict-read-write");
-			}
-		}
-
 		private class TestData
 		{
 			public long steveId;

src/NHibernate.Test/Legacy/ABCTest.cs

@@ -20,7 +20,7 @@ protected override IList Mappings
 		[Test]
 		public void HigherLevelIndexDefinitionInColumnTag()
 		{
-			string[] commands = cfg.GenerateSchemaCreationScript(dialect);
+			string[] commands = cfg.GenerateSchemaCreationScript(Dialect);
 
 			Assert.IsTrue(ContainsCommandWithSubstring(commands, "create index indx_a_name"),
 			              "Unable to locate indx_a_name index creation");
@@ -29,7 +29,7 @@ public void HigherLevelIndexDefinitionInColumnTag()
 		[Test]
 		public void HigherLevelIndexDefinitionInPropertyTag()
 		{
-			string[] commands = cfg.GenerateSchemaCreationScript(dialect);
+			string[] commands = cfg.GenerateSchemaCreationScript(Dialect);
 
 			Assert.IsTrue(ContainsCommandWithSubstring(commands, "create index indx_a_anothername"),
 			              "Unable to locate indx_a_anothername index creation");
@@ -57,7 +57,7 @@ public void Subselect()
 				t.Commit();
 			}
 
-			if (dialect is FirebirdDialect)
+			if (Dialect is FirebirdDialect)
 			{
 				// Firebird has problems deleting the map contents
 				ExecuteStatement("delete from Map");

src/NHibernate.Test/Legacy/FooBarTest.cs

@@ -345,8 +345,7 @@ public void MoveLazyCollection()
 				Assert.IsFalse(NHibernateUtil.IsInitialized(baz.FooSet));
 				Assert.AreEqual(0, baz.FooSet.Count);
 
-				// TODO: batching doesn't work in NH yet
-				//Assert.IsTrue( NHibernateUtil.IsInitialized( baz2.FooSet ) ); //fooSet has batching enabled
+				Assert.IsTrue( NHibernateUtil.IsInitialized( baz2.FooSet ) ); //FooSet has batching enabled
 
 				Assert.AreEqual(1, baz2.FooSet.Count);
 
@@ -460,7 +459,7 @@ public void Query()
 
 			s.CreateQuery("from bar in class Bar, foo in elements(bar.Baz.FooArray)").List();
 
-			if (dialect is DB2Dialect)
+			if (Dialect is DB2Dialect)
 			{
 				s.CreateQuery("from foo in class Foo where lower( foo.TheFoo.String ) = 'foo'").List();
 				s.CreateQuery("from foo in class Foo where lower( (foo.TheFoo.String || 'foo') || 'bar' ) = 'foo'").List();
@@ -473,7 +472,7 @@ public void Query()
 					.List();
 			}
 
-			if ((dialect is SybaseDialect) || (dialect is MsSql2000Dialect))
+			if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
 			{
 				s.CreateQuery("select baz from Baz as baz join baz.FooArray foo group by baz order by sum(foo.Float)").Enumerable();
 			}
@@ -510,9 +509,9 @@ public void Query()
 			foo.TheFoo.TheFoo = foo;
 			foo.String = "fizard";
 
-			if (dialect.SupportsSubSelects)
+			if (Dialect.SupportsSubSelects)
 			{
-				if (!(dialect is FirebirdDialect))
+				if (!(Dialect is FirebirdDialect))
 				{
 					list =
 						s.CreateQuery("from foo in class NHibernate.DomainModel.Foo where ? = some foo.Component.ImportantDates.elements")
@@ -615,7 +614,7 @@ public void Query()
 				"select foo.TheFoo.TheFoo.TheFoo from foo in class Foo, foo2 in class Foo where"
 				+ " foo = foo2.TheFoo and not not ( not foo.String='fizard' )"
 				+ " and foo2.String between 'a' and (foo.TheFoo.String)"
-				+ (dialect is SQLiteDialect
+				+ (Dialect is SQLiteDialect
 				   	? " and ( foo2.String in ( 'fiz', 'blah') or 1=1 )"
 				   	: " and ( foo2.String in ( 'fiz', 'blah', foo.TheFoo.String, foo.String, foo2.String ) )")
 				).List();
@@ -802,7 +801,7 @@ public void Query()
 				.List();
 
 			s.CreateQuery("from Baz baz inner join baz.CollectionComponent.Nested.Foos foo where foo.String is null").List();
-			if (dialect.SupportsSubSelects)
+			if (Dialect.SupportsSubSelects)
 			{
 				s.CreateQuery("from Baz baz inner join baz.FooSet where '1' in (from baz.FooSet foo where foo.String is not null)").
 					List();
@@ -1090,7 +1089,7 @@ public void QueryCollectionOfValues()
 				Glarch g = new Glarch();
 				gid = s.Save(g);
 
-				if (dialect.SupportsSubSelects)
+				if (Dialect.SupportsSubSelects)
 				{
 					s.CreateFilter(baz.FooArray, "where size(this.Bytes) > 0").List();
 					s.CreateFilter(baz.FooArray, "where 0 in elements(this.Bytes)").List();
@@ -2103,8 +2102,6 @@ public void FindByCriteria()
 			s.Flush();
 			s.Close();
 
-			//TODO: some HSQLDialect specific code here
-
 			s = OpenSession();
 			list = s.CreateCriteria(typeof(Foo))
 				.Add(Expression.Expression.Eq("Integer", f.Integer))
@@ -2264,8 +2261,6 @@ public void AssociationId()
 					stuf.Foo = bar;
 					stuf.Id = 1234;
 
-					//TODO: http://jira.nhibernate.org:8080/browse/NH-88
-					//stuf.setProperty(TimeZone.getDefault() );
 					s.Save(more);
 					t.Commit();
 				}
@@ -2348,9 +2343,6 @@ public void AssociationId()
 					stuff.MoreStuff = more;
 					s.Load(stuff, stuff);
 
-					// TODO: figure out what to do with TimeZone
-					// http://jira.nhibernate.org:8080/browse/NH-88
-					//Assert.IsTrue( stuff.getProperty().equals( TimeZone.getDefault() ) );
 					Assert.AreEqual("More Stuff", stuff.MoreStuff.Name);
 					s.Delete("from ms in class MoreStuff");
 					s.Delete("from foo in class Foo");
@@ -2399,7 +2391,7 @@ public void CompositeKeyPathExpressions()
 			hql = "from fum1 in class Fum where fum1.Fo.FumString is not null order by fum1.Fo.FumString";
 			s.CreateQuery(hql).List();
 
-			if (dialect.SupportsSubSelects)
+			if (Dialect.SupportsSubSelects)
 			{
 				hql = "from fum1 in class Fum where size(fum1.Friends) = 0";
 				s.CreateQuery(hql).List();
@@ -2465,15 +2457,9 @@ public void CollectionsInSelect()
 			Assert.AreEqual(baz.Name, r.Name);
 			Assert.AreEqual(1, r.Count);
 
-			// TODO: figure out a better way
-			// in hibernate this is hard coded as 696969696969696938l which is very dependant upon 
-			// how the test are run because it is calculated on a global static variable...
-			// maybe a better way to test this would be to assume that the first 
-			//Assert.AreEqual( 696969696969696969L, r.Amount );
-
 			s.CreateQuery("select max( elements(bar.Baz.FooArray) ) from Bar as bar").List();
 			// the following test is disable for databases with no subselects... also for Interbase (not sure why) - comment from h2.0.3
-			if (dialect.SupportsSubSelects)
+			if (Dialect.SupportsSubSelects)
 			{
 				s.CreateQuery("select count(*) from Baz as baz where 1 in indices(baz.FooArray)").List();
 				s.CreateQuery("select count(*) from Bar as bar where 'abc' in elements(bar.Baz.FooArray)").List();
@@ -2491,7 +2477,7 @@ public void CollectionsInSelect()
 					.List();
 
 				// TODO: figure out why this is throwing an ORA-1722 error
-				if (!(dialect is Oracle9Dialect))
+				if (!(Dialect is Oracle9Dialect))
 				{
 					s.CreateQuery(
 						"select count(*) from Bar as bar left outer join bar.Component.Glarch.ProxyArray as pg where 1 in (from g in bar.Component.Glarch.ProxyArray)")
@@ -2615,7 +2601,9 @@ public void NewFlushing()
 			IList newList = new ArrayList();
 			newList.Add("value");
 			baz.StringList = newList;
-			enumer = s.CreateQuery("from foo in class Foo").Enumerable().GetEnumerator(); //no flush
+			
+			s.CreateQuery("from foo in class Foo").Enumerable().GetEnumerator(); //no flush
+			
 			baz.StringList = null;
 			enumer = s.CreateQuery("select baz.StringList.elements from baz in class Baz").Enumerable().GetEnumerator();
 			Assert.IsFalse(enumer.MoveNext());
@@ -2669,7 +2657,7 @@ public void PersistCollections()
 			IList list;
 
 			// disable this for dbs with no subselects
-			if (dialect.SupportsSubSelects)
+			if (Dialect.SupportsSubSelects)
 			{
 				list =
 					s.CreateQuery(
@@ -2832,10 +2820,10 @@ public void PersistCollections()
 			s.Delete(baz.TopGlarchez['H']);
 
 			IDbCommand cmd = s.Connection.CreateCommand();
-			cmd.CommandText = "update " + dialect.QuoteForTableName("glarchez") + " set baz_map_id=null where baz_map_index='a'";
+			cmd.CommandText = "update " + Dialect.QuoteForTableName("glarchez") + " set baz_map_id=null where baz_map_index='a'";
 			int rows = cmd.ExecuteNonQuery();
 			Assert.AreEqual(1, rows);
-			Assert.AreEqual(1, s.Delete("from bar in class NHibernate.DomainModel.Bar"));
+			Assert.AreEqual(2, s.Delete("from bar in class NHibernate.DomainModel.Bar"));
 			FooProxy[] arr = baz.FooArray;
 			Assert.AreEqual(4, arr.Length);
 			Assert.AreEqual(foo.Key, arr[1].Key);
@@ -3154,7 +3142,7 @@ public void CollectionOfSelf()
 			Assert.IsTrue(bar.Abstracts.Contains(bar), "collection contains self");
 			Assert.AreSame(bar, bar.TheFoo, "association to self");
 
-			if (dialect is MySQLDialect)
+			if (Dialect is MySQLDialect)
 			{
 				// Break the self-reference cycle to avoid error when deleting the row
 				bar.TheFoo = null;
@@ -3866,7 +3854,7 @@ public void RecursiveLoad()
 
 		private bool DialectSupportsCountDistinct
 		{
-			get { return !(dialect is SQLiteDialect); }
+			get { return !(Dialect is SQLiteDialect); }
 		}
 
 		[Test]
@@ -4746,7 +4734,7 @@ public void Refresh()
 			s.Flush();
 
 			IDbCommand cmd = s.Connection.CreateCommand();
-			cmd.CommandText = "update " + dialect.QuoteForTableName("foos") + " set long_ = -3";
+			cmd.CommandText = "update " + Dialect.QuoteForTableName("foos") + " set long_ = -3";
 			cmd.ExecuteNonQuery();
 
 			s.Refresh(foo);
@@ -4770,10 +4758,10 @@ public void RefreshTransient()
 
 			s = OpenSession();
 			IDbCommand cmd = s.Connection.CreateCommand();
-			cmd.CommandText = "update " + dialect.QuoteForTableName("foos") + " set long_ = -3";
+			cmd.CommandText = "update " + Dialect.QuoteForTableName("foos") + " set long_ = -3";
 			cmd.ExecuteNonQuery();
 			s.Refresh(foo);
-			Assert.AreEqual((long) -3, foo.Long);
+			Assert.AreEqual(-3L, foo.Long);
 			s.Delete(foo);
 			s.Flush();
 			s.Close();
@@ -4795,7 +4783,7 @@ public void AutoFlush()
 			s = OpenSession();
 			foo = (FooProxy) s.Load(typeof(Foo), foo.Key);
 
-			if (dialect.SupportsSubSelects)
+			if (Dialect.SupportsSubSelects)
 			{
 				foo.Bytes = GetBytes("osama");
 				Assert.AreEqual(1,
@@ -4919,7 +4907,7 @@ public void AutoFlushCollections()
 					GetEnumerator();
 			Assert.IsTrue(e.MoveNext());
 
-			if (dialect.SupportsSubSelects && !(dialect is FirebirdDialect))
+			if (Dialect.SupportsSubSelects && !(Dialect is FirebirdDialect))
 			{
 				baz.FooArray[0] = null;
 				e = s.CreateQuery("from baz in class NHibernate.DomainModel.Baz where ? in baz.FooArray.elements")
@@ -5510,4 +5498,4 @@ public void ParameterInOrderByClause()
 
 		#endregion
 	}
-}
+}

src/NHibernate.Test/Legacy/FumTest.cs

@@ -605,7 +605,7 @@ public void CompositeKeyPathExpressions()
 			{
 				s.CreateQuery("select fum1.Fo from fum1 in class Fum where fum1.Fo.FumString is not null").List();
 				s.CreateQuery("from fum1 in class Fum where fum1.Fo.FumString is not null order by fum1.Fo.FumString").List();
-				if (dialect.SupportsSubSelects)
+				if (Dialect.SupportsSubSelects)
 				{
 					s.CreateQuery("from fum1 in class Fum where exists elements(fum1.Friends)").List();
 					s.CreateQuery("from fum1 in class Fum where size(fum1.Friends) = 0").List();

src/NHibernate.Test/Legacy/MasterDetailTest.cs

@@ -229,7 +229,7 @@ public void SelfManyToOne()
 			m = (Master) enumer.Current;
 			Assert.AreSame(m, m.OtherMaster);
 
-			if (dialect is MySQLDialect)
+			if (Dialect is MySQLDialect)
 			{
 				m.OtherMaster = null;
 				s.Flush();
@@ -283,7 +283,7 @@ public void ExampleTest()
 			              	.UniqueResult();
 			Assert.IsNull(m2);
 
-			if (dialect is MySQLDialect)
+			if (Dialect is MySQLDialect)
 			{
 				m1.OtherMaster = null;
 				s.Flush();
@@ -355,7 +355,7 @@ public void CollectionQuery()
 			ISession s = OpenSession();
 			ITransaction t = s.BeginTransaction();
 
-			if (dialect.SupportsSubSelects)
+			if (Dialect.SupportsSubSelects)
 			{
 				s.CreateQuery("FROM m IN CLASS Master WHERE NOT EXISTS ( FROM d in m.Details.elements WHERE NOT d.I=5 )").Enumerable
 					();
@@ -390,7 +390,7 @@ public void MasterDetail()
 			master.AddDetail(d1);
 			master.AddDetail(d2);
 
-			if (dialect.SupportsSubSelects)
+			if (Dialect.SupportsSubSelects)
 			{
 				string hql = "from d in class NHibernate.DomainModel.Detail, m in class NHibernate.DomainModel.Master " +
 				             "where m = d.Master and m.Outgoing.size = 0 and m.Incoming.size = 0";
@@ -640,7 +640,7 @@ public void Serialization()
 			d2.Master = (m);
 			m.AddDetail(d1);
 			m.AddDetail(d2);
-			if ((dialect is SybaseDialect) || (dialect is MsSql2000Dialect))
+			if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
 			{
 				s.Save(d1);
 			}
@@ -732,7 +732,7 @@ public void UpdateLazyCollections()
 			d2.Master = m;
 			m.AddDetail(d1);
 			m.AddDetail(d2);
-			if ((dialect is SybaseDialect) || (dialect is MsSql2000Dialect))
+			if ((Dialect is SybaseDialect) || (Dialect is MsSql2000Dialect))
 			{
 				s.Save(d1);
 				s.Save(d2);