[Nhibernate-commit] nhibernate/src/NHibernate.Test ABCProxyTest.cs,1.9,1.10 FooBarTest.cs,1.75,1.76 NHibernate.Test-1.1.csproj,1.55,1.56

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18075/NHibernate.Test

Modified Files:
	ABCProxyTest.cs FooBarTest.cs NHibernate.Test-1.1.csproj 
Log Message:
Removed some ignore attributes.

Index: FooBarTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/FooBarTest.cs,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** FooBarTest.cs	9 Dec 2004 20:57:26 -0000	1.75
--- FooBarTest.cs	16 Dec 2004 21:56:06 -0000	1.76
***************
*** 348,352 ****
  
  		[Test]
- 		[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void ForceOuterJoin() 
  		{
--- 348,351 ----
***************
*** 551,555 ****
  
  		[Test]
- 		[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void NamedParams() 
  		{
--- 550,553 ----
***************
*** 1351,1356 ****
  			}
  
- 			//TODO: once proxies is implemented get rid of the try-catch and notFound
- 			bool notFound = false;
  			try 
  			{
--- 1349,1352 ----
***************
*** 1359,1370 ****
  			catch(ObjectNotFoundException onfe) 
  			{
- 				notFound = true;
  				Assert.IsNotNull(onfe, "should not find a Qux with id of 666 when Proxies are not implemented.");
  			}
- 			Assert.IsTrue( 
- 				notFound, 
- 				"without proxies working - an ObjectNotFoundException should have been thrown.  " + 
- 				"If Proxies are implemented then you need to change this code" 
- 				);
  
  			Assert.AreEqual( 1, s.Delete("from g in class Glarch") );
--- 1355,1360 ----
***************
*** 1379,1400 ****
  			stream.Close();
  
! 			//TODO: once proxies is implemented get rid of the try-catch and notFound
! 			notFound = false;
! 			try 
! 			{
! 				s.Load( typeof(Qux), (long)666 ) ; //nonexistent
! 			}
! 			catch(HibernateException he) 
! 			{
! 				notFound = true;
! 				Assert.IsNotNull( he, "should have a session disconnected error when finding a Qux with id of 666 and Proxies are not implemented.");
! 			}
! 			Assert.IsTrue( 
! 				notFound, 
! 				"without proxies working - an ADOException/HibernateException should have been thrown.  " + 
! 				"If Proxies are implemented then you need to change this code because the ISession does " +
! 				"not need to be connected to the db when building a Proxy."
! 				);
! 			
  			s.Close();
  		}
--- 1369,1375 ----
  			stream.Close();
  
! 			Qux nonexistentQux = (Qux)s.Load( typeof(Qux), (long)666 ) ; //nonexistent
! 			Assert.IsNotNull( nonexistentQux, "even though it doesn't exists should still get a proxy - no db hit." );
! 
  			s.Close();
  		}
***************
*** 1552,1556 ****
  
  		[Test]
- 		[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void Load() 
  		{
--- 1527,1530 ----
***************
*** 2082,2085 ****
--- 2056,2062 ----
  			ISession sOld = sessions.OpenSession();
  			GlarchProxy gOld = (GlarchProxy)sOld.Load( typeof(Glarch), gid );
+ 			// want gOld to be initialized so later I can change a property
+ 			NHibernate.Initialize( gOld );
+ 			Assert.IsTrue( NHibernate.IsInitialized( gOld ), "should be initialized" );
  			sOld.Close();
  
***************
*** 2920,2924 ****
  
  		[Test]
- 		[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void ProxyArray() 
  		{
--- 2897,2900 ----
***************
*** 3254,3258 ****
  
  		[Test]
- 		[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void LoadAfterDelete() 
  		{
--- 3230,3233 ----
***************
*** 3517,3521 ****
  
  		[Test]
- 		[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void ProxiesInCollections() 
  		{
--- 3492,3495 ----

Index: ABCProxyTest.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/ABCProxyTest.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ABCProxyTest.cs	6 Aug 2004 14:50:34 -0000	1.9
--- ABCProxyTest.cs	16 Dec 2004 21:56:05 -0000	1.10
***************
*** 19,23 ****
  
  		[Test]
! 		[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void Subclassing()
  		{
--- 19,23 ----
  
  		[Test]
! 		//[Ignore("Proxies Required - http://jira.nhibernate.org:8080/browse/NH-41")]
  		public void Subclassing()
  		{

Index: NHibernate.Test-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** NHibernate.Test-1.1.csproj	16 Dec 2004 04:55:42 -0000	1.55
--- NHibernate.Test-1.1.csproj	16 Dec 2004 21:56:06 -0000	1.56
***************
*** 519,522 ****
--- 519,541 ----
                  />
                  <File
+                     RelPath = "ProxyInterface\CastleProxy.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "ProxyInterface\CastleProxyFixture.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "ProxyInterface\CastleProxyImpl.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "ProxyInterface\CastleProxyImpl.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
                      RelPath = "SqlCommandTest\SqlDeleteBuilderFixture.cs"
                      SubType = "Code"