[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory AbstractObjectFactoryTests.cs,1.2,1.3 DefaultListableObjectFactoryTests.cs,1.4,1.5

[Springboy <spr...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12095/test/Spring/Spring.Core.Tests/Objects/Factory

Modified Files:
	AbstractObjectFactoryTests.cs 
	DefaultListableObjectFactoryTests.cs 
Log Message:
Added test for the support of factory method instantiation.

Index: DefaultListableObjectFactoryTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultListableObjectFactoryTests.cs	1 Sep 2004 14:50:44 -0000	1.4
--- DefaultListableObjectFactoryTests.cs	28 Sep 2004 08:27:12 -0000	1.5
***************
*** 348,352 ****
  			lof.RegisterCustomConverter(typeof(Single), new CustomNumberConverter(typeof(Single), nfi, true));
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.AddPropertyValue("myFloat", "1.1");
  			lof.RegisterObjectDefinition("testObject", new RootObjectDefinition(typeof(TestObject), pvs));
  			TestObject testObject = (TestObject) lof.GetObject("testObject");
--- 348,352 ----
  			lof.RegisterCustomConverter(typeof(Single), new CustomNumberConverter(typeof(Single), nfi, true));
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.Add("myFloat", "1.1");
  			lof.RegisterObjectDefinition("testObject", new RootObjectDefinition(typeof(TestObject), pvs));
  			TestObject testObject = (TestObject) lof.GetObject("testObject");
***************
*** 382,387 ****
  			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.AddPropertyValue("name", "Tony");
! 			pvs.AddPropertyValue("age", "48");
  			RootObjectDefinition rod = new RootObjectDefinition(typeof(DependenciesObject), pvs, true);
  			rod.DependencyCheck = DependencyCheckingMode.Objects;
--- 382,387 ----
  			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.Add("name", "Tony");
! 			pvs.Add("age", "48");
  			RootObjectDefinition rod = new RootObjectDefinition(typeof(DependenciesObject), pvs, true);
  			rod.DependencyCheck = DependencyCheckingMode.Objects;
***************
*** 578,582 ****
  			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.AddPropertyValue(new PropertyValue("name", "Rod"));
  			RootObjectDefinition rood = new RootObjectDefinition(typeof(TestObject), pvs);
  			lof.RegisterObjectDefinition("rod", rood);
--- 578,582 ----
  			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.Add(new PropertyValue("name", "Rod"));
  			RootObjectDefinition rood = new RootObjectDefinition(typeof(TestObject), pvs);
  			lof.RegisterObjectDefinition("rod", rood);
***************
*** 595,599 ****
  			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.AddPropertyValue(new PropertyValue("name", "Rod"));
  			RootObjectDefinition rood = new RootObjectDefinition(typeof(TestObject), pvs);
  			lof.RegisterObjectDefinition("rod", rood);
--- 595,599 ----
  			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.Add(new PropertyValue("name", "Rod"));
  			RootObjectDefinition rood = new RootObjectDefinition(typeof(TestObject), pvs);
  			lof.RegisterObjectDefinition("rod", rood);
***************
*** 612,616 ****
  			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.AddPropertyValue(new PropertyValue("name", "Rod"));
  			RootObjectDefinition rod = new RootObjectDefinition(typeof(TestObject), pvs);
  			lof.RegisterObjectDefinition("rod", rod);
--- 612,616 ----
  			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
  			MutablePropertyValues pvs = new MutablePropertyValues();
! 			pvs.Add(new PropertyValue("name", "Rod"));
  			RootObjectDefinition rod = new RootObjectDefinition(typeof(TestObject), pvs);
  			lof.RegisterObjectDefinition("rod", rod);
***************
*** 628,632 ****
  			{
  				MutablePropertyValues pvs = new MutablePropertyValues();
! 				pvs.AddPropertyValue(new PropertyValue("Spouse", new RuntimeObjectReference("object" + (i < 99 ? i+1 : 0))));
  				RootObjectDefinition rod = new RootObjectDefinition(typeof(TestObject), pvs);
  				lof.RegisterObjectDefinition("object" + i, rod);
--- 628,632 ----
  			{
  				MutablePropertyValues pvs = new MutablePropertyValues();
! 				pvs.Add(new PropertyValue("Spouse", new RuntimeObjectReference("object" + (i < 99 ? i+1 : 0))));
  				RootObjectDefinition rod = new RootObjectDefinition(typeof(TestObject), pvs);
  				lof.RegisterObjectDefinition("object" + i, rod);

Index: AbstractObjectFactoryTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractObjectFactoryTests.cs	12 Jul 2004 07:48:16 -0000	1.2
--- AbstractObjectFactoryTests.cs	28 Sep 2004 08:27:12 -0000	1.3
***************
*** 340,344 ****
              ObjectFactory.GetObject ("&rod");
          }
! 		
          [Test]
          [ExpectedException (typeof (ObjectDefinitionStoreException))]
--- 340,344 ----
              ObjectFactory.GetObject ("&rod");
          }
! 	
          [Test]
          [ExpectedException (typeof (ObjectDefinitionStoreException))]