[xbuild] Clean up test logs.

Remove unnecessary debug spew for tests that pass.

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildItemTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildItemTest.cs
index 57467ad5a0cbd025f8d33cbbc370c1203b1d9dec..36f5e52f9b098933a5e1c2271a4c2dd179069e79 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildItemTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildItemTest.cs
@@ -783,7 +783,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                logger.DumpMessages ();
                                Assert.Fail ("Build failed");
                        }
-                       logger.DumpMessages ();
 
                        CheckMetadata (project, "A", "Meta", new string[] { "@(B)", "" }, "K1");
                        CheckEvaluatedMetadata (project, "A", "Meta", new string[] { "", "" }, "K2");

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildPropertyTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildPropertyTest.cs
index d3c944c7d2bc301a272ca00a27132530a64f6f27..03f46be4183592552e65d1949ee44ec734bc2c10 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildPropertyTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildPropertyTest.cs
@@ -374,9 +374,11 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 
                        xd = new XmlDocument ();
                        xd.LoadXml (project.Xml);
-                       Console.WriteLine(project.Xml);
                        node = xd.SelectSingleNode ("tns:Project/tns:PropertyGroup/tns:XmlProp/tns:XmlStuff", TestNamespaceManager.NamespaceManager);
-                       Assert.IsNotNull (node, "A1");
+                       if (node == null) {
+                               Console.WriteLine (project.Xml);
+                               Assert.Fail ("Expected node to be non-null");
+                       }
                }
 
        }

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildTaskTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildTaskTest.cs
index f9880b01cc7a07ba90c886da89b77daef62a36b6..1d3da0f4eff2bceed0ac116178ae0a315bd40a84 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildTaskTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildTaskTest.cs
@@ -342,6 +342,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                        bt [0].AddOutputItem ("Property", "ItemName");
                        project.Build ("T");
 
+                       Assert.IsNotNull (project.EvaluatedItems [0], "No items found");
                        Assert.AreEqual ("ItemName", project.EvaluatedItems [0].Name, "A1");
                        Assert.AreEqual ("some_text", project.EvaluatedItems [0].FinalItemSpec, "A2");
         }

diff --git a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
index 325986470d7e1dc50054510f33353f744776a725..0d07f2c2e042c96fd1f4da85d0a121d9d98fb2fc 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
@@ -111,7 +111,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                Assert.AreEqual (false, project.IsDirty, "A4");
                                Assert.AreEqual (false, project.IsValidated, "A5");
                                Assert.AreEqual (engine, project.ParentEngine, "A6");
-                               Console.WriteLine ("time: {0} p.t: {1}", time, project.TimeOfLastDirty);
+                               //Console.WriteLine ("time: {0} p.t: {1}", time, project.TimeOfLastDirty);
                                Assert.IsTrue (time <= project.TimeOfLastDirty, "A7");
                                Assert.IsTrue (String.Empty != project.Xml, "A8");
                                return;
@@ -1487,7 +1487,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                logger.DumpMessages ();
                                Assert.Fail ("A1: Build failed");
                        }
-                       logger.DumpMessages ();
                        BuildItemGroup include = project.GetEvaluatedItemsByName ("FinalList");
                        Assert.AreEqual (3, include.Count, "A2");
                }
@@ -2104,7 +2103,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                logger.DumpMessages ();
                                Assert.Fail ("A1: Build failed");
                        }
-                       logger.DumpMessages ();
 
                        logger.CheckLoggedMessageHead ("Full item: foo;FOO;hmm;bar", "#A2");
                        logger.CheckLoggedMessageHead ("metadata1 :md1 metadata2: md2", "#A3");
@@ -2265,7 +2263,7 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
                                        logger.CheckLoggedMessageHead (expected_output_msg, "A");
                                        Assert.AreEqual (0, logger.NormalMessageCount, "Unexpected messages found");
                                }
-                       } finally {
+                       } catch {
                                logger.DumpMessages ();
                        }
                        return project;

diff --git a/mcs/class/Microsoft.Build.Engine/Test/various/Items.cs b/mcs/class/Microsoft.Build.Engine/Test/various/Items.cs
index caf275754373f2b1c0ac28a0451b7c41aff1de14..5f6863be0757e2722555f6cf67a739341239c03c 100755 (executable)
--- a/mcs/class/Microsoft.Build.Engine/Test/various/Items.cs
+++ b/mcs/class/Microsoft.Build.Engine/Test/various/Items.cs
@@ -575,7 +575,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                                Assert.Fail ("Build failed");
                        }
 
-                       logger.DumpMessages ();
                        logger.CheckLoggedMessageHead ("Prop2: File1", "A1");
                        logger.CheckLoggedMessageHead ("Files: File1", "A1");
                        logger.CheckLoggedMessageHead ("Files: File1", "A1");
@@ -710,7 +709,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                                Assert.Fail ("Build failed");
                        }
 
-                       logger.DumpMessages ();
                        logger.CheckLoggedMessageHead ("Item1: Item1OldVal", "A1");
                        logger.CheckLoggedMessageHead ("Item1: Val", "A2");
                        logger.CheckLoggedMessageHead ("Item2: Item2OldVal", "A3");
@@ -787,7 +785,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                                Assert.Fail ("Build failed");
                        }
 
-                       logger.DumpMessages ();
                        logger.CheckLoggedMessageHead ("output1: property: null ## array: null", "A1");
                        logger.CheckLoggedMessageHead ("output2: property:    ## array: null", "A2");
                        logger.CheckLoggedMessageHead ("output3: property: null ## array: null", "A3");
@@ -1494,7 +1491,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine.Various {
                                logger.DumpMessages ();
                                Assert.Fail ("Build failed");
                        }
-                       logger.DumpMessages ();
 
                        logger.CheckLoggedMessageHead ("file1: " + Path.Combine ("bar", "foo.dll"), "A1");
 

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignCultureTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignCultureTest.cs
index 5aa8a5350200736af6547608b62b8f9bdbbb199b..29b883e398c6d4371814e0350da2f1e3e752a414 100755 (executable)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignCultureTest.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignCultureTest.cs
@@ -42,6 +42,7 @@ namespace MonoTests.Microsoft.Build.Tasks
 
                string [] files;
                Project project;
+               Engine engine;
 
                [SetUp]
                public void SetUp ()
@@ -63,7 +64,7 @@ namespace MonoTests.Microsoft.Build.Tasks
                                "sample.txt", @"bar\sample.txt",
                                "sample.it.png", @"dir\sample.en.png", "sample.inv.txt"};
 
-                       Engine engine = new Engine (Consts.BinPath);
+                       engine = new Engine (Consts.BinPath);
                        project = engine.CreateNewProject ();
                }
 
@@ -141,7 +142,14 @@ namespace MonoTests.Microsoft.Build.Tasks
                {
                        string projectText = CreateProjectString (files_list);
                        project.LoadXml (projectText);
-                       Assert.IsTrue (project.Build ("1"), "A1 : Error in building");
+
+                       TestMessageLogger testLogger = new TestMessageLogger ();
+                       engine.RegisterLogger (testLogger);
+
+                       if (!project.Build ("1")) {
+                               testLogger.DumpMessages ();
+                               Assert.Fail ("A1 : Error in building");
+                       }
                }
 
                void CheckItems (string [] values, string [] cultures, string itemlist_name, string prefix)

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignProjectConfigurationTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignProjectConfigurationTest.cs
index 3673526ed708c4a6e93dab1f392208fd5c2b9629..f7d25591a8ce8973f4046ed5dbb53331841463c1 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignProjectConfigurationTest.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignProjectConfigurationTest.cs
@@ -118,7 +118,6 @@ namespace MonoTests.Microsoft.Build.Tasks
 
                        try {
                                Assert.AreEqual (build_result, project.Build (), "Build " + (build_result ? "failed" : "should've failed"));
-                               testLogger.DumpMessages ();
                                if (!build_result || messages == null)
                                        // build failed as expected, don't check outputs
                                        return;

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CopyTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CopyTest.cs
index 0ef0c66023908a81965576106c71238dbc1fc3b9..e3cd166b9f9ad123dfb0713299d0cb3e832d08e3 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CopyTest.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CopyTest.cs
@@ -210,7 +210,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
                                testLogger.DumpMessages ();
                                Assert.Fail ("Build failed");
                        }
-                       testLogger.DumpMessages ();
                }
 
                [Test]

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/FindAppConfigFileTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/FindAppConfigFileTest.cs
index 5aaa23086b9873d294a760cd52fd43e04d44287a..d4dad192de17f2e35e7f09f958b5a4da2b10c621 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/FindAppConfigFileTest.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/FindAppConfigFileTest.cs
@@ -119,7 +119,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
                                testLogger.DumpMessages ();
                                Assert.Fail ("Build failed");
                        }
-                       testLogger.DumpMessages ();
 
                        Assert.AreEqual (1, testLogger.NormalMessageCount, "Expected number of messages");
                        testLogger.CheckLoggedMessageHead (expected, "A1");

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/MessageTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/MessageTest.cs
index 22d6d636267d17b523df7613fa246c5192d6160e..1aa785622ba7e91e8b9f10a9d9d3cb286d17750f 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/MessageTest.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/MessageTest.cs
@@ -95,7 +95,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
                                Assert.Fail ("Build should have failed");
                        }
                        
-                       testLogger.DumpMessages ();
                        Assert.AreEqual (0, testLogger.CheckAny ("Text1", MessageImportance.Low), "A1");
                        Assert.AreEqual (0, testLogger.CheckAny ("Text2", MessageImportance.Normal), "A2");
                        Assert.AreEqual (0, testLogger.CheckAny ("Text3", MessageImportance.High), "A3");
@@ -104,7 +103,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
                        Assert.AreEqual (0, testLogger.CheckAny ("Text6", MessageImportance.High), "A6");
                        Assert.AreEqual (0, testLogger.CheckAny ("Text7", MessageImportance.Normal), "A7");
                        Assert.AreEqual (1, testLogger.CheckAny ("Text8", MessageImportance.Normal), "A8");
-                       
                }
        }
 }      

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs
index e854812b76b16e12f7fd70b0d18dbc87d15eca3c..2e457d5716b32da066f65e0802bfdfd5e171a91d 100755 (executable)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs
@@ -905,7 +905,6 @@ namespace MonoTests.Microsoft.Build.Tasks
                                testLogger.DumpMessages ();
                                Assert.Fail ("Build failed");
                        }
-                       testLogger.DumpMessages ();
 
                        try {
                                testLogger.CheckLoggedAny ("For md: 3 Item1:  Item1Ref:  Item2: Three Item2Ref: Three  Prop1:  Prop1Ref:  Prop2: Three Prop2Ref: Three", MessageImportance.Normal, "A1");

diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TestMessageLogger.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TestMessageLogger.cs
index be855ade2d78a20931632ee7fdce04cddab81ff5..6b33fbe00660722c563edbd60d162a5a2a69b789 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TestMessageLogger.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TestMessageLogger.cs
@@ -95,8 +95,8 @@ namespace MonoTests.Microsoft.Build.Tasks
                        eventSource.TargetFinished += delegate { target_finished++; };
                        eventSource.TaskStarted += delegate { task_started++; };
                        eventSource.TaskFinished += delegate { task_finished++; };
-                       eventSource.ProjectStarted += delegate(object sender, ProjectStartedEventArgs args) { project_started++; Console.WriteLine ("Project started: {0}", args.ProjectFile); };
-                       eventSource.ProjectFinished += delegate (object sender, ProjectFinishedEventArgs args) { project_finished++; Console.WriteLine ("Project finished: {0}", args.ProjectFile); };
+                       eventSource.ProjectStarted += delegate(object sender, ProjectStartedEventArgs args) { project_started++; };
+                       eventSource.ProjectFinished += delegate (object sender, ProjectFinishedEventArgs args) { project_finished++; };
                        eventSource.BuildStarted += delegate { build_started ++; };
                        eventSource.BuildFinished += delegate { build_finished++; };
                }