[Springnet-commits] Spring.Net/test/Spring/Spring.Web.Tests/Web/UI PageTests.cs, 1.6, 1.7 UserControlTests.cs, 1.1, 1.2

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/Web/UI
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29101/test/Spring/Spring.Web.Tests/Web/UI

Modified Files:
	PageTests.cs UserControlTests.cs 
Log Message:
introduced TestWebContextTests base class for unit testing web objects (Page,UserControl etc.)
added validation related tests

Index: PageTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PageTests.cs	2 Feb 2008 09:12:45 -0000	1.6
--- PageTests.cs	15 Mar 2008 11:19:39 -0000	1.7
***************
*** 25,28 ****
--- 25,29 ----
  using System.Globalization;
  using System.Threading;
+ using System.Web;
  using NUnit.Framework;
  using Rhino.Mocks;
***************
*** 45,67 ****
      /// <version>$Id$</version>
      [TestFixture]
!     public class PageTests
      {
-         [TestFixtureSetUp]
-         public void TestFixtureSetUp()
-         {
-             // ensure, uiCulture and culture are set to different cultures
-             CultureTestScope.Set();
-         }
- 
-         [TestFixtureTearDown]
-         public void TestFixtureTearDown()
-         {
-             CultureTestScope.Reset();
-         }
- 
          [Test]
          public void Validate()
          {           
!             Page page = new TestPage();
              IValidator[] validators = new IValidator[] {new RequiredValidator("Name", null), new ConditionValidator("Loan == 0", "Age > 21")};
              Contact contact = new Contact("Goran", 24, 0);
--- 46,55 ----
      /// <version>$Id$</version>
      [TestFixture]
!     public class PageTests : TestWebContextTests
      {
          [Test]
          public void Validate()
          {           
!             Page page = new TestPage(HttpContext.Current);
              IValidator[] validators = new IValidator[] {new RequiredValidator("Name", null), new ConditionValidator("Loan == 0", "Age > 21")};
              Contact contact = new Contact("Goran", 24, 0);

Index: UserControlTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/Web/UI/UserControlTests.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UserControlTests.cs	2 Feb 2008 10:24:39 -0000	1.1
--- UserControlTests.cs	15 Mar 2008 11:19:39 -0000	1.2
***************
*** 21,31 ****
  #region Imports
  
- using System;
  using System.Web;
  using System.Web.UI;
- using System.Web.UI.HtmlControls;
  using NUnit.Framework;
  using Rhino.Mocks;
! using Spring.Util;
  using Spring.Web.Support;
  
--- 21,30 ----
  #region Imports
  
  using System.Web;
  using System.Web.UI;
  using NUnit.Framework;
  using Rhino.Mocks;
! using Spring.TestSupport;
! using Spring.Validation;
  using Spring.Web.Support;
  
***************
*** 40,44 ****
      /// <version>$Id$</version>
      [TestFixture]
!     public class UserControlTests
      {
          public class TestUserControl : UserControl
--- 39,43 ----
      /// <version>$Id$</version>
      [TestFixture]
!     public class UserControlTests : TestWebContextTests
      {
          public class TestUserControl : UserControl
***************
*** 86,90 ****
              Result theResult = (Result)mocks.CreateMock(typeof(Result));
  
!             using(mocks.Ordered())
              {
                  theResult.Navigate(c1);
--- 85,89 ----
              Result theResult = (Result)mocks.CreateMock(typeof(Result));
  
!             using (mocks.Ordered())
              {
                  theResult.Navigate(c1);
***************
*** 97,100 ****
--- 96,111 ----
          }
  
+         [Test]
+         public void ValidateSetsDefaultVariables()
+         {
+             TestPage page = new TestPage(HttpContext.Current);
+             TestUserControl c1 = new TestUserControl();
+             page.Controls.Add(c1);
+ 
+             ConditionValidator v1 = new ConditionValidator("#page == #this.Page", null);
+             ConditionValidator v2 = new ConditionValidator("#usercontrol == #this", null);
+ 
+             Assert.IsTrue(c1.Validate(c1, v1, v2));
+         }
      }
  }
\ No newline at end of file