fix test failure and create guid to new proj

navin22 · Oct 20, 2016 · 4884bd5 · 4884bd5
1 parent 4e32485
commit 4884bd5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs
@@ -336,17 +336,20 @@ public void StartTestRunShouldCallHandleLogMessageOnTestMessage()
                 ExecutorUris = null, LastRunTests = null, RunAttachments = null, TestRunCompleteArgs = null
             };
             var completeMessage = new Message() { MessageType = MessageType.ExecutionComplete, Payload = null };
+            var waitHandle = new AutoResetEvent(false);
             mockHandler.Setup(mh => mh.HandleLogMessage(TestMessageLevel.Error, rawMessage)).Callback(
                 () =>
                 {
                     this.mockDataSerializer.Setup(ds => ds.DeserializeMessage(It.IsAny<string>())).Returns(completeMessage);
                     this.mockDataSerializer.Setup(ds => ds.DeserializePayload<TestRunCompletePayload>(completeMessage)).Returns(completePayload);
+                    waitHandle.Set();
                 });
 
             this.testRequestSender.StartTestRun(runCriteria, mockHandler.Object);
+            waitHandle.WaitOne();
 
             this.mockCommunicationManager.Verify(mc => mc.SendMessage(MessageType.StartTestExecutionWithSources, runCriteria), Times.Once);
-            this.mockDataSerializer.Verify(ds => ds.DeserializeMessage(It.IsAny<string>()), Times.Once);
+            this.mockDataSerializer.Verify(ds => ds.DeserializeMessage(It.IsAny<string>()), Times.Exactly(2));
             mockHandler.Verify(mh => mh.HandleLogMessage(payload.MessageLevel, payload.Message), Times.Once);
             mockHandler.Verify(mh => mh.HandleRawMessage(rawMessage), Times.AtLeastOnce);
         }

diff --git a/test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs b/test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs
@@ -19,4 +19,4 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("12d59ced-9916-4c3f-af82-12e019757fd2")]
+[assembly: Guid("da1b5c6f-cd2b-4995-b883-0aafcd6671ab")]
diff --git a/test/TestAssets/PerfTestProject/Properties/AssemblyInfo.cs b/test/TestAssets/PerfTestProject/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("37c76c3d-947e-48a6-af68-2d7c9ec35f6f")]
+[assembly: Guid("a65720f2-449d-45aa-87fe-6d6b62c0097e")]
 
 // Version information for an assembly consists of the following four values:
 //