From: Paul H. <pha...@us...> - 2005-03-31 12:42:53
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19247/nhibernate/src/NHibernate.Test Modified Files: ABCProxyTest.cs ABCTest.cs FooBarTest.cs FumTest.cs MultiTableTest.cs NHibernate.Test-1.1.csproj ParentChildTest.cs SQLFunctionsTest.cs SQLLoaderTest.cs Added Files: BlobClobTest.cs NewerPerformanceTest.cs Log Message: Enhanced test suite as per 2.1 - tests marked with Ignore where not implemented Index: NHibernate.Test-1.1.csproj =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** NHibernate.Test-1.1.csproj 28 Mar 2005 12:45:57 -0000 1.68 --- NHibernate.Test-1.1.csproj 31 Mar 2005 12:42:39 -0000 1.69 *************** *** 129,132 **** --- 129,137 ---- /> <File + RelPath = "BlobClobTest.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "CriteriaTest.cs" SubType = "Code" *************** *** 163,166 **** --- 168,176 ---- /> <File + RelPath = "NewerPerformanceTest.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "NewPerformanceTest.cs" SubType = "Code" Index: SQLFunctionsTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SQLFunctionsTest.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SQLFunctionsTest.cs 1 Jan 2005 20:39:38 -0000 1.7 --- SQLFunctionsTest.cs 31 Mar 2005 12:42:39 -0000 1.8 *************** *** 46,49 **** --- 46,54 ---- [Test] + [Ignore("Test not written yet.")] + public void DialectSQLFunctions() + { + } + [Test] public void SetProperties() { *************** *** 61,64 **** --- 66,76 ---- } + + [Test] + [Ignore("Test not written yet.")] + public void Broken() + { + } + [Test] public void NothingToUpdate() *************** *** 87,90 **** --- 99,126 ---- } + + [Test] + [Ignore("Test not written yet.")] + public void CachedQuery() + { + } + [Test] + [Ignore("Test not written yet.")] + public void SQLFunctionAsAlias() + { + } + + [Test] + [Ignore("Test not written yet.")] + public void CachedQueryOnInsert() + { + } + + [Test] + [Ignore("Test not written yet.")] + public void CachedQueryRegion() + { + } + [Test] public void SQLFunctions() *************** *** 234,243 **** } - [Test] - [Ignore("BLOB/CLOB not implmented like h2.0.3 - http://jira.nhibernate.org:8080/browse/NH-19")] - public void BlobClob() - { - } - } --- 270,273 ---- Index: ParentChildTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ParentChildTest.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ParentChildTest.cs 17 Jan 2005 03:40:51 -0000 1.12 --- ParentChildTest.cs 31 Mar 2005 12:42:39 -0000 1.13 *************** *** 63,66 **** --- 63,96 ---- [Test] + [Ignore("Test not written yet.")] + public void Replicate() + { + } + + [Test] + [Ignore("Test not written yet.")] + public void QueryOneToOne() + { + } + + [Test] + [Ignore("Test not written yet.")] + public void ProxyReuse() + { + } + + [Test] + [Ignore("Test not written yet.")] + public void ComplexCriteria() + { + } + + [Test] + [Ignore("Test not written yet.")] + public void ClassWhere() + { + } + + [Test] public void CollectionQuery() { *************** *** 697,723 **** } ! // [Test] ! // public void ObjectType() ! // { ! // ISession s = sessions.OpenSession(); ! // Parent g = new Parent(); ! // Foo foo = new Foo(); ! // g.Any = foo; ! // s.Save(g); ! // s.Save(foo); ! // s.Flush(); ! // s.Close(); ! // ! // s = sessions.OpenSession(); ! // g = (Parent)s.Load( typeof(Parent), g.Id ); ! // Assert.IsNotNull( g.Any ); ! // Assert.IsTrue( g.Any is FooProxy ); ! // s.Delete( g.Any ); ! // s.Delete(g); ! // s.Flush(); ! // s.Close(); ! // } ! } } --- 727,751 ---- } ! [Test] ! public void ObjectType() ! { ! ISession s = sessions.OpenSession(); ! Parent g = new Parent(); ! Foo foo = new Foo(); ! g.Any = foo; ! s.Save(g); ! s.Save(foo); ! s.Flush(); ! s.Close(); + s = sessions.OpenSession(); + g = (Parent)s.Load( typeof(Parent), g.Id ); + Assert.IsNotNull( g.Any ); + Assert.IsTrue( g.Any is FooProxy ); + s.Delete( g.Any ); + s.Delete(g); + s.Flush(); + s.Close(); + } } } Index: FumTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FumTest.cs,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FumTest.cs 17 Jan 2005 03:40:51 -0000 1.18 --- FumTest.cs 31 Mar 2005 12:42:39 -0000 1.19 *************** *** 65,103 **** #endregion ! public static FumCompositeID FumKey(String str) { - - return FumKey(str,false); } ! ! public static FumCompositeID FumKey(String str, bool aCompositeQueryTest) { - FumCompositeID id = new FumCompositeID(); - // if( dialect is Dialect.MckoiDialect ) - // { - // GregorianCalendar now = new GregorianCalendar(); - // GregorianCalendar cal = new GregorianCalendar( - // now.get(java.util.Calendar.YEAR), - // now.get(java.util.Calendar.MONTH), - // now.get(java.util.Calendar.DATE) - // ); - // id.setDate( cal.getTime() ); - // } - // else - // { - id.Date = new DateTime(2004, 4, 29, 9, 0, 0, 0); - // } - id.String = str; - - if (aCompositeQueryTest) - { - id.Short = fumKeyShort++ ; - } - else - { - id.Short = (short)12 ; - } - - return id; } --- 65,78 ---- #endregion ! [Test] ! [Ignore("Test not written")] ! public void CriteriaCollection() { } ! ! [Test] ! [Ignore("Test not written")] ! public void Criteria() { } *************** *** 135,142 **** s.Flush(); s.Close(); - - } [Test] public void CompositeID() --- 110,151 ---- s.Flush(); s.Close(); } + public static FumCompositeID FumKey(String str) + { + return FumKey(str,false); + } + + public static FumCompositeID FumKey(String str, bool aCompositeQueryTest) + { + FumCompositeID id = new FumCompositeID(); + // if( dialect is Dialect.MckoiDialect ) + // { + // GregorianCalendar now = new GregorianCalendar(); + // GregorianCalendar cal = new GregorianCalendar( + // now.get(java.util.Calendar.YEAR), + // now.get(java.util.Calendar.MONTH), + // now.get(java.util.Calendar.DATE) + // ); + // id.setDate( cal.getTime() ); + // } + // else + // { + id.Date = new DateTime(2004, 4, 29, 9, 0, 0, 0); + // } + id.String = str; + + if (aCompositeQueryTest) + { + id.Short = fumKeyShort++ ; + } + else + { + id.Short = (short)12 ; + } + + return id; + } + [Test] public void CompositeID() *************** *** 421,425 **** - [Test] [Ignore("HQL can't parse a class named 'Order' - http://jira.nhibernate.org:8080/browse/NH-81, this test passes when changed to NHibernate.DomainModel")] --- 430,433 ---- *************** *** 473,476 **** --- 481,504 ---- s.Close(); } + + + [Test] + [Ignore("Test not written")] + public void CompositeKeyPathExpressions() + { + } + + [Test] + [Ignore("Test not written")] + public void UnflushedSessionSerialization() + { + } + + private ISession SpoofSerialization( ISession session) + { + // TODO: Not test method - implement details + + return null; + } } } Index: ABCProxyTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ABCProxyTest.cs,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ABCProxyTest.cs 26 Mar 2005 14:10:51 -0000 1.14 --- ABCProxyTest.cs 31 Mar 2005 12:42:39 -0000 1.15 *************** *** 43,47 **** [Test] ! //[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")] public void Subclassing() { --- 43,64 ---- [Test] ! [Ignore("Test not written")] ! public void DiscriminatorFiltering() ! { ! } ! ! [Test] ! [Ignore("Test not written")] ! public void OptionalOneToOneInCollection() ! { ! } ! ! [Test] ! [Ignore("Test not written")] ! public void SharedColumn() ! { ! } ! ! [Test] public void Subclassing() { Index: SQLLoaderTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/SQLLoaderTest.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SQLLoaderTest.cs 27 Mar 2005 23:30:26 -0000 1.2 --- SQLLoaderTest.cs 31 Mar 2005 12:42:39 -0000 1.3 *************** *** 53,57 **** [Test] ! public void TestTS() { if ( dialect is NHibernate.Dialect.Oracle9Dialect ) --- 53,57 ---- [Test] ! public void TS() { if ( dialect is NHibernate.Dialect.Oracle9Dialect ) *************** *** 74,78 **** [Test] ! public void TestTSNamed() { if ( dialect is NHibernate.Dialect.Oracle9Dialect ) --- 74,78 ---- [Test] ! public void TSNamed() { if ( dialect is NHibernate.Dialect.Oracle9Dialect ) *************** *** 95,99 **** [Test] ! public void TestFindBySQLStar() { ISession session = sessions.OpenSession(); --- 95,99 ---- [Test] ! public void FindBySQLStar() { ISession session = sessions.OpenSession(); *************** *** 127,131 **** [Test] ! public void TestFindBySQLProperties() { ISession session = sessions.OpenSession(); --- 127,131 ---- [Test] ! public void FindBySQLProperties() { ISession session = sessions.OpenSession(); *************** *** 151,155 **** [Test] ! public void TestFindBySQLAssociatedObject() { ISession s = sessions.OpenSession(); --- 151,155 ---- [Test] ! public void FindBySQLAssociatedObject() { ISession s = sessions.OpenSession(); *************** *** 178,182 **** [Test] ! public void TestFindBySQLMultipleObject() { ISession s = sessions.OpenSession(); --- 178,182 ---- [Test] ! public void FindBySQLMultipleObject() { ISession s = sessions.OpenSession(); *************** *** 227,231 **** [Test] [Ignore("Test not written")] ! public void TestFindBySQLParameters() { } --- 227,231 ---- [Test] [Ignore("Test not written")] ! public void FindBySQLParameters() { } *************** *** 233,237 **** [Test] [Ignore("Test not written")] ! public void TestEscapedODBC() { } --- 233,237 ---- [Test] [Ignore("Test not written")] ! public void EscapedODBC() { } *************** *** 239,243 **** [Test] [Ignore("Test not written")] ! public void TestDoubleAliasing() { } --- 239,243 ---- [Test] [Ignore("Test not written")] ! public void DoubleAliasing() { } *************** *** 245,249 **** [Test] [Ignore("Test not written")] ! public void TestEmbeddedCompositeProperties() { } --- 245,249 ---- [Test] [Ignore("Test not written")] ! public void EmbeddedCompositeProperties() { } *************** *** 251,255 **** [Test] [Ignore("Test not written")] ! public void TestComponentStar() { } --- 251,255 ---- [Test] [Ignore("Test not written")] ! public void ComponentStar() { } *************** *** 257,261 **** [Test] [Ignore("Test not written")] ! public void TestComponentNoStar() { } --- 257,261 ---- [Test] [Ignore("Test not written")] ! public void ComponentNoStar() { } *************** *** 267,271 **** [Test] [Ignore("Test not written")] ! public void TestFindSimpleBySQL() { } --- 267,271 ---- [Test] [Ignore("Test not written")] ! public void FindSimpleBySQL() { } *************** *** 273,277 **** [Test] [Ignore("Test not written")] ! public void TestFindBySQLSimpleByDiffSessions() { } --- 273,277 ---- [Test] [Ignore("Test not written")] ! public void FindBySQLSimpleByDiffSessions() { } *************** *** 279,283 **** [Test] [Ignore("Test not written")] ! public void TestFindBySQLDiscriminatorSameSession() { } --- 279,283 ---- [Test] [Ignore("Test not written")] ! public void FindBySQLDiscriminatorSameSession() { } *************** *** 285,289 **** [Test] [Ignore("Test not written")] ! public void TestFindBySQLDiscriminatedDiffSessions() { } --- 285,289 ---- [Test] [Ignore("Test not written")] ! public void FindBySQLDiscriminatedDiffSessions() { } *************** *** 291,295 **** [Test] [Ignore("Test not written")] ! public void TestNamedSQLQuery() { } --- 291,295 ---- [Test] [Ignore("Test not written")] ! public void NamedSQLQuery() { } Index: FooBarTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** FooBarTest.cs 29 Mar 2005 05:33:14 -0000 1.89 --- FooBarTest.cs 31 Mar 2005 12:42:39 -0000 1.90 *************** *** 38,48 **** } ! /// <summary> ! /// ! /// </summary> ! /// <remarks> ! /// This test is still not completely working because it depends on Proxies which ! /// has not been implemented yet. ! /// </remarks> [Test] [...964 lines suppressed...] - } - } - - /// <summary> /// This test verifies that the AddAll() method works --- 3933,3936 ---- *************** *** 3786,3790 **** } } ! } } --- 3963,3967 ---- } } ! #endregion } } --- NEW FILE: BlobClobTest.cs --- using System; using NUnit.Framework; using NHibernate; using NHibernate.DomainModel; namespace NHibernate.Test { /// <summary> /// Summary description for BlobClobTest. /// </summary> [TestFixture] public class BlobClobTest : TestCase { [Test] [Ignore("BLOB/CLOB not implmented like h2.0.3 - http://jira.nhibernate.org:8080/browse/NH-19")] public void BlobClob() { } } } --- NEW FILE: NewerPerformanceTest.cs --- using System; using NHibernate.DomainModel; using NUnit.Framework; namespace NHibernate.Test { /// <summary> /// Summary description for NewerPerformanceTest. /// </summary> [TestFixture] public class NewerPerformanceTest : TestCase { [SetUp] public void SetUp() { ExportSchema( new string[] { "Simple.hbm.xml"} ); } [Test] [Ignore("Test not written yet.")] public void Many() { } [Test] [Ignore("Test not written yet.")] public void Simultaneous() { } [Test] [Ignore("Test not written yet.")] public void NHibernateOnly() { } [Test] [Ignore("Test not written yet.")] public void AdoOnly() { } private void NHibernate() { //TODO: add details - not a test method } private void DirectAdo() { //TODO: add details - not a test method } } } Index: MultiTableTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/MultiTableTest.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MultiTableTest.cs 14 Mar 2005 18:56:13 -0000 1.8 --- MultiTableTest.cs 31 Mar 2005 12:42:39 -0000 1.9 *************** *** 22,26 **** [Test] ! public void TestJoins() { ISession s = sessions.OpenSession(); --- 22,33 ---- [Test] ! [Ignore("Test not written yet.")] ! public void FetchManyToOne() ! { ! } ! ! ! [Test] ! public void Joins() { ISession s = sessions.OpenSession(); *************** *** 39,42 **** --- 46,55 ---- } + + [Test] + [Ignore("Test not written yet.")] + public void JoinOpenBug() + { + } [Test] public void SubclassCollection() Index: ABCTest.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ABCTest.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ABCTest.cs 1 Jan 2005 20:39:38 -0000 1.10 --- ABCTest.cs 31 Mar 2005 12:42:39 -0000 1.11 *************** *** 47,50 **** --- 47,62 ---- [Test] + [Ignore("Test not written")] + public void HigherLevelIndexDefinition() + { + } + + [Test] + [Ignore("Test not written")] + public void Subselect() + { + } + + [Test] public void Subclassing() { *************** *** 111,114 **** --- 123,132 ---- s.Close(); } + + [Test] + [Ignore("Test not written")] + public void GetSave() + { + } } } |