[Springnet-commits] Spring.Net/test/Spring/Spring.Web.Tests/Web/Support PageHandlerFactoryTests.cs, 1.3, 1.4

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

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

Modified Files:
	PageHandlerFactoryTests.cs 
Log Message:
fixed SPRNET-838

Index: PageHandlerFactoryTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PageHandlerFactoryTests.cs	21 Jan 2008 07:04:46 -0000	1.3
--- PageHandlerFactoryTests.cs	27 Jan 2008 23:29:55 -0000	1.4
***************
*** 23,26 ****
--- 23,27 ----
  using System;
  using System.Web;
+ using System.IO;
  using NUnit.Extensions.Asp.AspTester;
  using NUnit.Framework;
***************
*** 63,69 ****
  
          [Test]
!         public void BCLPageFactoryThrowsHttp404()
          {
!             using (TestWebContext ctx = new TestWebContext("/Test", "/DoesNotExist.oaspx"))
              {
                  try
--- 64,70 ----
  
          [Test]
!         public void BCLPageHandlerFactoryBehavior()
          {
!             using (TestWebContext ctx = new TestWebContext("/Test", "DoesNotExist.oaspx"))
              {
                  try
***************
*** 72,80 ****
                      phf.GetHandler(HttpContext.Current, "GET", ctx.HttpWorkerRequest.GetFilePath(), ctx.HttpWorkerRequest.GetFilePathTranslated());
                  }
                  catch (HttpException e)
                  {
!                     Assert.AreEqual( 404, e.GetHttpCode() );
!                     Assert.IsTrue( e.Message.IndexOf(ctx.HttpWorkerRequest.GetFilePath()) > 0);
                  }
              }
          }
--- 73,111 ----
                      phf.GetHandler(HttpContext.Current, "GET", ctx.HttpWorkerRequest.GetFilePath(), ctx.HttpWorkerRequest.GetFilePathTranslated());
                  }
+ #if NET_2_0
                  catch (HttpException e)
                  {
!                     Assert.AreEqual(404, e.GetHttpCode());
!                     Assert.IsTrue(e.Message.IndexOf(ctx.HttpWorkerRequest.GetFilePath()) > 0);
                  }
+ #else
+                 catch (FileNotFoundException)
+                 {
+                 }
+ #endif
+             }
+         }
+ 
+         [Test]
+         public void PageHandlerFactoryBehavesLikeSystemPageHandlerFactory()
+         {
+             using (TestWebContext ctx = new TestWebContext("/Test", "DoesNotExist.aspx"))
+             {
+                 try
+                 {
+                     IHttpHandlerFactory phf = new PageHandlerFactory();
+                     phf.GetHandler(HttpContext.Current, "GET", ctx.HttpWorkerRequest.GetFilePath(), ctx.HttpWorkerRequest.GetFilePathTranslated());
+                 }
+ #if NET_2_0
+                 catch (HttpException e)
+                 {
+                     Assert.AreEqual(404, e.GetHttpCode());
+                     Assert.IsTrue(e.Message.IndexOf(ctx.HttpWorkerRequest.GetFilePath()) > 0);
+                 }
+ #else
+                 catch (FileNotFoundException)
+                 {
+                 }
+ #endif
              }
          }