[xbuild]: Fix the tests.

'TestMessageLogger.Count' should not be used in tests to check for the
number of logged messages because it would also includes diagnostic messages.

Extra diagnostic messages should not be considered an error condition; in
fact, we have too few diagnostic messages, not too many.

Use 'TestMessageLogger.NormalMessageCount' and 'TestMessageLogger.WarningMessageCount'
instead.

1 files changed, 2 insertions, 1 deletions

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
index faa959fae4e..738cd2a2587 100644
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs
@@ -416,6 +416,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 				for (int i = 0; i < messages.Length; i++)
 					logger.CheckLoggedMessageHead (messages [i], i.ToString ());
 				Assert.AreEqual(0, logger.NormalMessageCount, "Extra messages found");
+				Assert.AreEqual(0, logger.WarningMessageCount, "Extra warningmessages found");
 				
 				Assert.AreEqual(expectedTargetCount, logger.TargetStarted, "TargetStarted count");
 				Assert.AreEqual(expectedTargetCount, logger.TargetFinished, "TargetFinished count");
@@ -968,7 +969,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 		{
 			engine = new Engine (Consts.BinPath);
 			project = engine.CreateNewProject ();
-			project.Load (Path.Combine ("Test", "resources", "TestReturns.csproj"));
+			project.Load (Path.Combine ("Test", Path.Combine ("resources", "TestReturns.csproj")));
 
 			var logger = new TestMessageLogger ();
 			engine.RegisterLogger (logger);