Merge pull request #85 from unoplatform/dev/sb/displayname

feat: Add support for DisplayName
unoplatform · Mar 21, 2023 · cbf16c3 · cbf16c3
2 parents 6a2c15b + e9a44b5
commit cbf16c3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 18 deletions.
diff --git a/src/TestApp/shared/SanityTests.cs b/src/TestApp/shared/SanityTests.cs
@@ -39,6 +39,13 @@ public async Task When_Test_ContentHelper()
 			await UnitTestsUIContentHelper.WaitForLoaded(SUT);
 		}
 
+		[TestMethod]
+		[DataRow("hello", DisplayName = "hello test")]
+		[DataRow("goodbye", DisplayName = "goodbye test")]
+		public void Is_Sane_With_Cases(string text)
+		{
+		}
+
 #if DEBUG
 		[TestMethod]
 		public async Task No_Longer_Sane() // expected to fail

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/UI/TestCase.cs b/src/Uno.UI.RuntimeTests.Engine.Library/UI/TestCase.cs
@@ -12,6 +12,8 @@ internal record TestCase
 {
 	public object[] Parameters { get; init; } = Array.Empty<object>();
 
+	public string? DisplayName { get; init; }
+
 	public PointerDeviceType? Pointer { get; init; }
 
 	/// <inheritdoc />

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/UI/UnitTestMethodInfo.cs b/src/Uno.UI.RuntimeTests.Engine.Library/UI/UnitTestMethodInfo.cs
@@ -13,7 +13,7 @@ namespace Uno.UI.RuntimeTests;
 
 internal record UnitTestMethodInfo
 {
-	private readonly List<object[]> _casesParameters;
+	private readonly List<ITestDataSource> _casesParameters;
 	private readonly IList<PointerDeviceType> _injectedPointerTypes;
 
 	public UnitTestMethodInfo(object testClassInstance, MethodInfo method)
@@ -30,18 +30,11 @@ public UnitTestMethodInfo(object testClassInstance, MethodInfo method)
 			.SingleOrDefault()
 			?.ExceptionType;
 
-		_casesParameters = method
-			.GetCustomAttributes<DataRowAttribute>()
-			.Select(d => d.Data)
+		_casesParameters  = method
+			.GetCustomAttributes()
+			.Where(x => x is ITestDataSource)
+			.Cast<ITestDataSource>()
 			.ToList();
-		if (method.GetCustomAttribute<DynamicDataAttribute>() is {} dynamicData)
-		{
-			_casesParameters.AddRange(dynamicData.GetData(method));
-		}
-		if (_casesParameters is { Count: 0 })
-		{
-			_casesParameters.Add(Array.Empty<object>());
-		}
 
 		_injectedPointerTypes = method
 			.GetCustomAttributes<InjectedPointerAttribute>()
@@ -83,17 +76,32 @@ public bool IsIgnored(out string ignoreMessage)
 
 	public IEnumerable<TestCase> GetCases()
 	{
-		var cases = _casesParameters.Select(parameters => new TestCase { Parameters = parameters });
+		List<TestCase> cases = Enumerable.Empty<TestCase>().ToList();
+
+		if (_casesParameters is { Count: 0 })
+		{
+			cases.Add(new TestCase());
+		}
+
+		foreach (var testCaseSource in _casesParameters)
+		{
+			foreach (var caseData in testCaseSource.GetData(Method))
+			{
+				var data = testCaseSource.GetData(Method)
+					.SelectMany(x => x)
+					.ToArray();
+
+				cases.Add(new TestCase { Parameters = data, DisplayName = testCaseSource.GetDisplayName(Method, data) });
+			}
+		}
 
 		if (_injectedPointerTypes.Any())
 		{
-			var currentCases = cases.ToList();
-			cases = _injectedPointerTypes.SelectMany(pointer => currentCases.Select(testCase => testCase with { Pointer = pointer }));
+			var currentCases = cases;
+			cases = _injectedPointerTypes.SelectMany(pointer => currentCases.Select(testCase => testCase with { Pointer = pointer })).ToList();
 		}
 
 		return cases;
 	}
 }
-
-
 #endif
diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/UI/UnitTestsControl.cs b/src/Uno.UI.RuntimeTests.Engine.Library/UI/UnitTestsControl.cs
@@ -750,7 +750,7 @@ private async Task ExecuteTestsForInstance(
 
 			async Task InvokeTestMethod(TestCase testCase)
 			{
-				var fullTestName = testName + testCase.ToString();
+				var fullTestName = string.IsNullOrWhiteSpace(testCase.DisplayName) ? testName + testCase.ToString() : testCase.DisplayName!;
 
 				if (_currentRun is null)
 				{