Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/mcs
diff options
context:
space:
mode:
authorMarek Habersack <grendel@twistedcode.net>2010-04-07 17:25:51 +0400
committerMarek Habersack <grendel@twistedcode.net>2010-04-07 17:25:51 +0400
commit275847592c377d0ff7562640aeff56e75dfbb40b (patch)
treeae6d45d1341ebe5dcee14bd1abc582009fb033f0 /mcs
parent8849b08183d9918e1e5faf7e515ec65ebc1da62d (diff)
Backport of r154745
svn path=/branches/mono-2-6/mcs/; revision=154952
Diffstat (limited to 'mcs')
-rw-r--r--mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs4
-rw-r--r--mcs/class/System.Web/Test/System.Web.UI/PageParserTest.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
index be63b6822d7..ec5560dfd07 100644
--- a/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
@@ -222,11 +222,11 @@ namespace MonoTests.System.Web.Compilation {
}
[Test (Description="Bug #524358")]
- [ExpectedException ("System.Web.Compilation.ParseException")]
public void DuplicateControlsInClientComment ()
{
// Just test if it throws an exception
- new WebTest ("DuplicateControlsInClientComment.aspx").Run ();
+ string pageHtml = new WebTest ("DuplicateControlsInClientComment.aspx").Run ();
+ Assert.IsTrue (pageHtml.IndexOf ("[System.Web.Compilation.ParseException]:") != -1, "#A1");
}
[Test (Description="Bug #367723")]
diff --git a/mcs/class/System.Web/Test/System.Web.UI/PageParserTest.cs b/mcs/class/System.Web/Test/System.Web.UI/PageParserTest.cs
index 8f94f587a42..50825f57a16 100644
--- a/mcs/class/System.Web/Test/System.Web.UI/PageParserTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/PageParserTest.cs
@@ -44,10 +44,10 @@ namespace MonoTests.System.Web.UI
}
[Test]
- [ExpectedException ("System.Web.Compilation.ParseException")]
public void MissingMasterFile ()
{
- new WebTest ("MissingMasterFile.aspx").Run ();
+ string pageHtml = new WebTest ("MissingMasterFile.aspx").Run ();
+ Assert.IsTrue (pageHtml.IndexOf ("[System.Web.Compilation.ParseException]:") != -1, "#A1");
}
}
}