[Harness] Remove the BCLTestProjectInfo class.

The class is not really needed. Move to a tuple, make the definition of the group test project nicer since the dictionary initiallization makes it cleaner.
xamarin · Mar 28, 2020 · ab95d46 · ab95d46
1 parent a150c95
commit ab95d46
Show file tree

Hide file tree

Showing 6 changed files with 211 additions and 158 deletions.
diff --git a/tests/xharness/BCLTestImporter/BCLTestProjectGenerator.cs b/tests/xharness/BCLTestImporter/BCLTestProjectGenerator.cs
diff --git a/tests/xharness/BCLTestImporter/BclTestProjectInfo.cs b/tests/xharness/BCLTestImporter/BclTestProjectInfo.cs
diff --git a/tests/xharness/BCLTestImporter/Templates/ITemplatedProject.cs b/tests/xharness/BCLTestImporter/Templates/ITemplatedProject.cs
@@ -29,6 +29,6 @@ public interface ITemplatedProject {
 		/// has its own details.</param>
 		/// <param name="generatedDir">The dir where the projects will be saved.</param>
 		/// <returns></returns>
-		Task<GeneratedProjects> GenerateTestProjectsAsync (IEnumerable<BclTestProjectInfo> projects, Platform platform);
+		Task<GeneratedProjects> GenerateTestProjectsAsync (IEnumerable<(string Name, string [] Assemblies, string ExtraArgs, double TimeoutMultiplier)> projects, Platform platform);
 	}
 }
diff --git a/tests/xharness/BCLTestImporter/Templates/Managed/XamariniOSTemplate.cs b/tests/xharness/BCLTestImporter/Templates/Managed/XamariniOSTemplate.cs
@@ -311,7 +311,7 @@ string GenerateIncludeFilesNode (string projectName, (string FailureMessage, Lis
 			return contentFiles.ToString ();
 		}
 
-		public async Task<GeneratedProjects> GenerateTestProjectsAsync (IEnumerable<BclTestProjectInfo> projects, Platform platform)
+		public async Task<GeneratedProjects> GenerateTestProjectsAsync (IEnumerable<(string Name, string [] Assemblies, string ExtraArgs, double TimeoutMultiplier)> projects, Platform platform)
 		{
 			// generate the template c# code before we create the diff projects
 			await GenerateSource (Path.Combine (OutputDirectoryPath, "templates"));
@@ -382,7 +382,7 @@ async Task<string> GenerateWatchExtensionAsync (string projectName, Stream templ
 		}
 
 		// internal implementations that generate each of the diff projects
-		async Task<GeneratedProjects> GenerateWatchOSTestProjectsAsync (IEnumerable<BclTestProjectInfo> projects)
+		async Task<GeneratedProjects> GenerateWatchOSTestProjectsAsync (IEnumerable<(string Name, string [] Assemblies, string ExtraArgs, double TimeoutMultiplier)> projects)
 		{
 			var projectPaths = new GeneratedProjects ();
 			foreach (var def in projects) {
@@ -391,7 +391,7 @@ async Task<GeneratedProjects> GenerateWatchOSTestProjectsAsync (IEnumerable<BclT
 				// 2. The container
 				// 3. The extensions
 				// TODO: The following is very similar to what is done in the iOS generation. Must be grouped
-				var projectDefinition = new BCLTestProjectDefinition (def.Name, AssemblyLocator, AssemblyDefinitionFactory, def.assemblies, def.ExtraArgs);
+				var projectDefinition = new BCLTestProjectDefinition (def.Name, AssemblyLocator, AssemblyDefinitionFactory, def.Assemblies, def.ExtraArgs);
 				if (ProjectFilter != null && ProjectFilter.ExludeProject (projectDefinition, Platform.WatchOS)) // if it is ignored, continue
 					continue;
 
@@ -507,17 +507,17 @@ async Task<string> GenerateAsync (string projectName, string registerPath, (stri
 			}
 		}
 
-		async Task<GeneratedProjects> GenerateiOSTestProjectsAsync (IEnumerable<BclTestProjectInfo> projects, Platform platform)
+		async Task<GeneratedProjects> GenerateiOSTestProjectsAsync (IEnumerable<(string Name, string [] Assemblies, string ExtraArgs, double TimeoutMultiplier)> projects, Platform platform)
 		{
 			if (platform == Platform.WatchOS)
 				throw new ArgumentException (nameof (platform));
 			if (!projects.Any ()) // return an empty list
 				return new GeneratedProjects ();
 			var projectPaths = new GeneratedProjects ();
 			foreach (var def in projects) {
-				if (def.assemblies.Length == 0)
+				if (def.Assemblies.Length == 0)
 					continue;
-				var projectDefinition = new BCLTestProjectDefinition (def.Name, AssemblyLocator, AssemblyDefinitionFactory, def.assemblies, def.ExtraArgs);
+				var projectDefinition = new BCLTestProjectDefinition (def.Name, AssemblyLocator, AssemblyDefinitionFactory, def.Assemblies, def.ExtraArgs);
 				if (ProjectFilter != null && ProjectFilter.ExludeProject (projectDefinition, Platform.WatchOS)) // if it is ignored, continue
 					continue;
 
@@ -608,13 +608,13 @@ async Task<string> GenerateMacAsync (string projectName, string registerPath, (s
 			}
 		}
 
-		async Task<GeneratedProjects> GenerateMacTestProjectsAsync (IEnumerable<BclTestProjectInfo> projects, Platform platform)
+		async Task<GeneratedProjects> GenerateMacTestProjectsAsync (IEnumerable<(string Name, string [] Assemblies, string ExtraArgs, double TimeoutMultiplier)> projects, Platform platform)
 		{
 			var projectPaths = new GeneratedProjects ();
 			foreach (var def in projects) {
-				if (!def.assemblies.Any ())
+				if (!def.Assemblies.Any ())
 					continue;
-				var projectDefinition = new BCLTestProjectDefinition (def.Name, AssemblyLocator, AssemblyDefinitionFactory, def.assemblies, def.ExtraArgs);
+				var projectDefinition = new BCLTestProjectDefinition (def.Name, AssemblyLocator, AssemblyDefinitionFactory, def.Assemblies, def.ExtraArgs);
 				if (ProjectFilter != null && ProjectFilter.ExludeProject (projectDefinition, platform))
 					continue;
 

diff --git a/tests/xharness/Xharness.Tests/BCLTestImporter/Tests/BCLTestProjectGeneratorTest.cs b/tests/xharness/Xharness.Tests/BCLTestImporter/Tests/BCLTestProjectGeneratorTest.cs
@@ -88,20 +88,16 @@ public async Task GenerateTestProjectsAsyncTest ()
 				( Name: "First project", Path: "", XUnit: false, ExtraArgs: "", Failure: "", TimeoutMultiplier: 1),
 				( Name: "Second project", Path: "", XUnit: true, ExtraArgs: "", Failure: "", TimeoutMultiplier: 1),
 			};
-			var infos = new List<BclTestProjectInfo> {
-				new BclTestProjectInfo {
-					Name = "First project",
-				},
-				new BclTestProjectInfo {
-					Name = "Second project",
-				}
+			var infos = new List<(string Name, string [] Assemblies, string ExtraArgs, double TimeoutMultiplier)> {
+				( Name: "First project", Assemblies: new string [] { }, ExtraArgs: "", TimeoutMultiplier: 1),
+				( Name: "Second project", Assemblies: new string [] { }, ExtraArgs: "", TimeoutMultiplier: 1),
 			};
-			template.Setup (t => t.GenerateTestProjectsAsync (It.IsAny<IEnumerable<BclTestProjectInfo>> (), It.IsAny<Platform> ())).Returns (() => {
+			template.Setup (t => t.GenerateTestProjectsAsync (It.IsAny<IEnumerable<(string Name, string [] Assemblies, string ExtraArgs, double TimeoutMultiplier)>> (), It.IsAny<Platform> ())).Returns (() => {
 				return Task.FromResult (projects);
 			});
 			var result = await generator.GenerateTestProjectsAsync (infos, Platform.iOS);
 			Assert.AreEqual (projects.Count, result.Count);
-			template.Verify (t => t.GenerateTestProjectsAsync (It.IsAny<IEnumerable<BclTestProjectInfo>> (), It.IsAny<Platform> ()));
+			template.Verify (t => t.GenerateTestProjectsAsync (It.IsAny<IEnumerable<(string Name, string [] Assemblies, string ExtraArgs, double TimeoutMultiplier)>> (), It.IsAny<Platform> ()));
 		}
 	}
 }
diff --git a/tests/xharness/xharness.csproj b/tests/xharness/xharness.csproj
@@ -163,7 +163,6 @@
     <Compile Include="XmlResultParser.cs" />
     <Compile Include="BCLTestImporter\Templates\ITemplatedProject.cs" />
     <Compile Include="BCLTestImporter\Templates\Managed\XamariniOSTemplate.cs" />
-    <Compile Include="BCLTestImporter\BclTestProjectInfo.cs" />
     <Compile Include="BCLTestImporter\IAssemblyLocator.cs" />
     <Compile Include="BCLTestImporter\Templates\IProjectFilter.cs" />
     <Compile Include="BCLTestImporter\Xamarin\AssemblyLocator.cs" />