2009-05-15 Marek Sieradzki <marek.sieradzki@gmail.com>

        * Items.cs
        * Conditions.cs: Don't check exception messages.

svn path=/trunk/mcs/; revision=134167

diff --git a/mcs/class/Microsoft.Build.Engine/Test/various/ChangeLog b/mcs/class/Microsoft.Build.Engine/Test/various/ChangeLog
index 80ecce55ba55ea472de94184cad6bb6aa0b7fa78..d29d2d43b063979ee5ec0046abc49995d7da009a 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/various/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Test/various/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-15  Marek Sieradzki  <marek.sieradzki@gmail.com>
+
+       * Items.cs
+       * Conditions.cs: Don't check exception messages.
+
 2009-02-23  Ankit Jain  <jankit@novell.com>
 
        * Items.cs (TestItemsInTarget8): New.

diff --git a/mcs/class/Microsoft.Build.Engine/Test/various/Conditions.cs b/mcs/class/Microsoft.Build.Engine/Test/various/Conditions.cs
index aa56b132a6bb41845c629fedbdc6165487fc2e76..f7aa66819cdc4b61f5667d7af669efd8db49c535 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/various/Conditions.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/various/Conditions.cs
@@ -354,9 +354,9 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                        proj.LoadXml (documentString);
                }
 
+               // A reference to an item list at position 1 is not allowed in this condition "@(A)".
                [Test]
-               [ExpectedException (typeof (InvalidProjectFileException),
-                       "A reference to an item list at position 1 is not allowed in this condition \"@(A)\".  ")]
+               [ExpectedException (typeof (InvalidProjectFileException))]
                [Category ("NotWorking")]
                public void TestIncorrectCondition2 ()
                {
@@ -374,9 +374,9 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                        proj.LoadXml (documentString);
                }
 
+               // Found an unexpected character '%' at position 0 in condition \%(A)\.
                [Test]
-               [ExpectedException (typeof (InvalidProjectFileException),
-                       "Found an unexpected character '%' at position 0 in condition \"%(A)\".  ")]
+               [ExpectedException (typeof (InvalidProjectFileException))]
                [Category ("NotWorking")]
                public void TestIncorrectCondition3 ()
                {
@@ -394,9 +394,9 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                        proj.LoadXml (documentString);
                }
 
+               // Found an unexpected character '%' at position 0 in condition "%(A)\.
                [Test]
-               [ExpectedException (typeof (InvalidProjectFileException),
-                       "Found an unexpected character '%' at position 0 in condition \"%(A)\".  ")]
+               [ExpectedException (typeof (InvalidProjectFileException))]
                [Category ("NotWorking")]
                public void TestIncorrectCondition4 ()
                {

diff --git a/mcs/class/Microsoft.Build.Engine/Test/various/Items.cs b/mcs/class/Microsoft.Build.Engine/Test/various/Items.cs
index 852afd0bde32ea51e5b6f008b9b7ec9578715008..8ecbc51856eabe5fa0ab220eded7f095271292d3 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/various/Items.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/various/Items.cs
@@ -237,11 +237,11 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                        CheckItems (proj, "Item7", "A6", "A", "B", "C");
                }
 
+               // The expression "@(Item1, '@(A,'')')" cannot be used in this context. 
+               // Item lists cannot be concatenated with other strings where an item list is expected. 
+               // Use a semicolon to separate multiple item lists.
                [Test]
-               [ExpectedException (typeof (InvalidProjectFileException),
-                       "The expression \"@(Item1, '@(A,'')')\" cannot be used in this context. " +
-                       "Item lists cannot be concatenated with other strings where an item list is expected. " +
-                       "Use a semicolon to separate multiple item lists.  ")]
+               [ExpectedException (typeof (InvalidProjectFileException))]
                [Category ("NotWorking")]
                public void TestItems7 ()
                {
@@ -260,11 +260,11 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                        proj.LoadXml (documentString);
                }
 
+               // The expression "@(Item1, '@(A->'')')" cannot be used in this context.
+               // Item lists cannot be concatenated with other strings where an item list is expected.
+               // Use a semicolon to separate multiple item lists.
                [Test]
-               [ExpectedException (typeof (InvalidProjectFileException),
-                       "The expression \"@(Item1, '@(A->'')')\" cannot be used in this context. " +
-                       "Item lists cannot be concatenated with other strings where an item list is expected. " +
-                       "Use a semicolon to separate multiple item lists.  ")]
+               [ExpectedException (typeof (InvalidProjectFileException))]
                [Category ("NotWorking")]
                public void TestItems8 ()
                {
@@ -283,11 +283,11 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                        proj.LoadXml (documentString);
                }
 
+               // The expression "@(Item1, '@(A->'','')')" cannot be used in this context.
+               // Item lists cannot be concatenated with other strings where an item list is expected.
+               // Use a semicolon to separate multiple item lists.
                [Test]
-               [ExpectedException (typeof (InvalidProjectFileException),
-                       "The expression \"@(Item1, '@(A->'','')')\" cannot be used in this context. " +
-                       "Item lists cannot be concatenated with other strings where an item list is expected. " +
-                       "Use a semicolon to separate multiple item lists.  ")]
+               [ExpectedException (typeof (InvalidProjectFileException))]
                [Category ("NotWorking")]
                public void TestItems9 ()
                {