Skip to content

Commit

Permalink
[xbuild] Clean up test logs.
Browse files Browse the repository at this point in the history 
Remove unnecessary debug spew for tests that pass.
  • Loading branch information
@radical
radical committed Mar 11, 2011
1 parent 34519d2 commit 2ec3380
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 21 deletions.
1 change: 0 additions & 1 deletion mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildItemTest.cs
View file
Expand Up @@ -783,7 +783,6 @@ public void TestSetMetadata5 ()
logger.DumpMessages ();
Assert.Fail ("Build failed");
}
logger.DumpMessages ();

CheckMetadata (project, "A", "Meta", new string[] { "@(B)", "" }, "K1");
CheckEvaluatedMetadata (project, "A", "Meta", new string[] { "", "" }, "K2");
Expand Down
6 changes: 4 additions & 2 deletions mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildPropertyTest.cs
View file
Expand Up @@ -374,9 +374,11 @@ public void TestValueXml ()

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");
}
}

}
Expand Down
1 change: 1 addition & 0 deletions mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/BuildTaskTest.cs
View file
Expand Up @@ -342,6 +342,7 @@ public void TestAddOutputItem2 ()
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");
}
Expand Down
6 changes: 2 additions & 4 deletions mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs
View file
Expand Up @@ -111,7 +111,7 @@ public void TestAssignment1 ()
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;
Expand Down Expand Up @@ -1487,7 +1487,6 @@ public void TestBatchedMetadataRef5 ()
logger.DumpMessages ();
Assert.Fail ("A1: Build failed");
}
logger.DumpMessages ();
BuildItemGroup include = project.GetEvaluatedItemsByName ("FinalList");
Assert.AreEqual (3, include.Count, "A2");
}
Expand Down Expand Up @@ -2104,7 +2103,6 @@ public void TestCaseSensitivityOfProjectElements ()
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");
Expand Down Expand Up @@ -2265,7 +2263,7 @@ void CheckFilesExistInDir (string dir, params string [] files)
logger.CheckLoggedMessageHead (expected_output_msg, "A");
Assert.AreEqual (0, logger.NormalMessageCount, "Unexpected messages found");
}
} finally {
} catch {
logger.DumpMessages ();
}
return project;
Expand Down
4 changes: 0 additions & 4 deletions mcs/class/Microsoft.Build.Engine/Test/various/Items.cs
View file
Expand Up @@ -575,7 +575,6 @@ public void TestItems12 ()
Assert.Fail ("Build failed");
}

logger.DumpMessages ();
logger.CheckLoggedMessageHead ("Prop2: File1", "A1");
logger.CheckLoggedMessageHead ("Files: File1", "A1");
logger.CheckLoggedMessageHead ("Files: File1", "A1");
Expand Down Expand Up @@ -710,7 +709,6 @@ public void TestSelfRefrentialItems ()
Assert.Fail ("Build failed");
}

logger.DumpMessages ();
logger.CheckLoggedMessageHead ("Item1: Item1OldVal", "A1");
logger.CheckLoggedMessageHead ("Item1: Val", "A2");
logger.CheckLoggedMessageHead ("Item2: Item2OldVal", "A3");
Expand Down Expand Up @@ -787,7 +785,6 @@ public void TestEmptyItemsWithBatching ()
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");
Expand Down Expand Up @@ -1494,7 +1491,6 @@ public void TestReservedMetadata ()
logger.DumpMessages ();
Assert.Fail ("Build failed");
}
logger.DumpMessages ();

logger.CheckLoggedMessageHead ("file1: " + Path.Combine ("bar", "foo.dll"), "A1");

Expand Down
12 changes: 10 additions & 2 deletions mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignCultureTest.cs
View file
Expand Up @@ -42,6 +42,7 @@ public class AssignCultureTest

string [] files;
Project project;
Engine engine;

[SetUp]
public void SetUp ()
Expand All @@ -63,7 +64,7 @@ public void SetUp ()
"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 ();
}

Expand Down Expand Up @@ -141,7 +142,14 @@ void LoadAndBuildProject (string [] files_list)
{
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)
Expand Down
1 change: 0 additions & 1 deletion mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/AssignProjectConfigurationTest.cs
View file
Expand Up @@ -118,7 +118,6 @@ void CreateAndCheckProject (string[] guids, string[] project_ref_guids, string[]

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;
Expand Down
1 change: 0 additions & 1 deletion mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CopyTest.cs
View file
Expand Up @@ -210,7 +210,6 @@ public void TestCopy2 ()
testLogger.DumpMessages ();
Assert.Fail ("Build failed");
}
testLogger.DumpMessages ();
}

[Test]
Expand Down
1 change: 0 additions & 1 deletion mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/FindAppConfigFileTest.cs
View file
Expand Up @@ -119,7 +119,6 @@ public void TestExecution6 ()
testLogger.DumpMessages ();
Assert.Fail ("Build failed");
}
testLogger.DumpMessages ();

Assert.AreEqual (1, testLogger.NormalMessageCount, "Expected number of messages");
testLogger.CheckLoggedMessageHead (expected, "A1");
Expand Down
2 changes: 0 additions & 2 deletions mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/MessageTest.cs
View file
Expand Up @@ -95,7 +95,6 @@ public void TestExecution ()
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");
Expand All @@ -104,7 +103,6 @@ public void TestExecution ()
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");

}
}
}
Expand Down
1 change: 0 additions & 1 deletion mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TaskBatchingTest.cs
View file
Expand Up @@ -905,7 +905,6 @@ public void TestFilter ()
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");
Expand Down
4 changes: 2 additions & 2 deletions mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TestMessageLogger.cs
View file
Expand Up @@ -95,8 +95,8 @@ public void Initialize (IEventSource eventSource)
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++; };
}
Expand Down

0 comments on commit 2ec3380

Please sign in to comment.