parallel tester fix (#435)

p-org · Jun 12, 2019 · 1b70405 · 1b70405
1 parent da2a777
commit 1b70405
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 42 deletions.
diff --git a/Tools/Testing/Tester/Interfaces/ITestingProcess.cs b/Tools/Testing/Tester/Interfaces/ITestingProcess.cs
@@ -5,8 +5,9 @@
 
 #if NET46
 using System.ServiceModel;
-#endif
+
 using Microsoft.PSharp.TestingServices.Coverage;
+#endif
 
 namespace Microsoft.PSharp.TestingServices
 {
@@ -15,14 +16,15 @@ namespace Microsoft.PSharp.TestingServices
     /// </summary>
 #if NET46
     [ServiceContract(Namespace = "Microsoft.PSharp")]
-    [ServiceKnownType("GetKnownTypes", typeof(KnownTypesProvider))]
+    [ServiceKnownType(typeof(TestReport))]
+    [ServiceKnownType(typeof(CoverageInfo))]
+    [ServiceKnownType(typeof(Transition))]
 #endif
     internal interface ITestingProcess
     {
         /// <summary>
         /// Returns the test report.
         /// </summary>
-        /// <returns>TestReport</returns>
 #if NET46
         [OperationContract]
 #endif

diff --git a/Tools/Testing/Tester/Interfaces/ITestingProcessScheduler.cs b/Tools/Testing/Tester/Interfaces/ITestingProcessScheduler.cs
@@ -6,31 +6,37 @@
 #if NET46
 using System.ServiceModel;
 
+using Microsoft.PSharp.TestingServices.Coverage;
+#endif
+
 namespace Microsoft.PSharp.TestingServices
 {
     /// <summary>
     /// Interface for a remote P# testing process scheduler.
     /// </summary>
+#if NET46
     [ServiceContract(Namespace = "Microsoft.PSharp")]
-    [ServiceKnownType("GetKnownTypes", typeof(KnownTypesProvider))]
+    [ServiceKnownType(typeof(TestReport))]
+    [ServiceKnownType(typeof(CoverageInfo))]
+    [ServiceKnownType(typeof(Transition))]
+#endif
     internal interface ITestingProcessScheduler
     {
         /// <summary>
         /// Notifies the testing process scheduler
         /// that a bug was found.
         /// </summary>
-        /// <param name="processId">Unique process id</param>
-        /// <returns>Boolean value</returns>
+#if NET46
         [OperationContract]
+#endif
         void NotifyBugFound(uint processId);
 
         /// <summary>
         /// Sets the test report from the specified process.
         /// </summary>
-        /// <param name="testReport">TestReport</param>
-        /// <param name="processId">Unique process id</param>
+#if NET46
         [OperationContract]
+#endif
         void SetTestReport(TestReport testReport, uint processId);
     }
 }
-#endif
diff --git a/Tools/Testing/Tester/Interfaces/KnownTypesProvider.cs b/Tools/Testing/Tester/Interfaces/KnownTypesProvider.cs