try suggested approach

Sauceforge · Dec 16, 2024 · 12d8ef4 · 12d8ef4
1 parent e94336d
commit 12d8ef4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 51 deletions.
diff --git a/Merlin.TUnit/DataDrivenData.cs b/Merlin.TUnit/DataDrivenData.cs
diff --git a/Merlin.TUnit/DataDrivenTests.cs b/Merlin.TUnit/DataDrivenTests.cs
@@ -1,39 +1,48 @@
-using Saucery.Core.Dojo;
+using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
 using Saucery.Tests.Common.PageObjects;
 using Saucery.TUnit;
 using Shouldly;
-using System.Drawing.Drawing2D;
 
 namespace Merlin.TUnit;
 
 public class DataDrivenTests : SauceryTBase
 {
-    //[Test]
-    //public async Task ComboTest()
-    //{
-    //    var combos = RequestedPlatformData.AllCombinations([4, 5]);
-    //    var count = combos.Count;
-    //    Console.WriteLine($"combos: {count}");
-    //}
-
-
     [Test]
-    //[MethodDataSource(nameof(AllCombinations))]
-    //[MethodDataSource(typeof(RequestedPlatformData), nameof(RequestedPlatformData.AllCombinations([4,5])))]
-
-    //public async Task DataDrivenTest(DataDrivenData dataDrivenData)
-    public async Task DataDrivenTest(
-        [Matrix(nameof(RequestedPlatformData.AllPlatformsAsList))] BrowserVersion requestedPlatform,
-        [Matrix(4, 5)] int data)
+    [MethodDataSource(nameof(AllCombinations))]
+    public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
     {
-        //InitialiseDriver(dataDrivenData.RequestedPlatform);
         InitialiseDriver(requestedPlatform);
 
         var guineaPigPage = new GuineaPigPage(SauceryDriver(), "https://saucelabs.com/");
 
-        //guineaPigPage.TypeField(SauceryDriver(), "comments", dataDrivenData.Data.ToString());
         guineaPigPage.TypeField(SauceryDriver(), "comments", data.ToString());
     }
+
+    public IEnumerable<(BrowserVersion, int)> AllCombinations() =>
+        from browserVersion 
+            in SauceryTestData.Items 
+        from data in new[] { 4, 5 } 
+        select (browserVersion, data);
+
+    //public static List<Func<DataDrivenData>> AllCombinations()
+    //{
+    //    var allPlatforms = RequestedPlatformData.AllPlatforms;
+
+    //    return GetAllCombinationsAsFunc([4, 5])
+    //        .ConvertAll<Func<DataDrivenData>>(func => () =>
+    //        {
+    //            var array = func();
+    //            var requestedPlatform = (BrowserVersion)array[0];
+    //            var data = (int)array[1];
+
+    //            return new DataDrivenData
+    //            {
+    //                RequestedPlatform = requestedPlatform,
+    //                Data = data
+    //            };
+    //        });
+    //}
 }
 
 /*

diff --git a/Merlin.TUnit/RequestedPlatformData.cs b/Merlin.TUnit/RequestedPlatformData.cs
@@ -3,7 +3,6 @@
 using Saucery.Core.OnDemand;
 using Saucery.Core.OnDemand.Base;
 using Saucery.Core.Util;
-using System.Collections;
 
 namespace Merlin.TUnit;
 
@@ -38,26 +37,6 @@ static RequestedPlatformData()
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();
-    public static List<BrowserVersion> AllPlatformsAsList() => Items.ToList();
-
-    public static List<Func<DataDrivenData>> AllCombinations(object[] data)
-    {
-        List<Func<DataDrivenData>> dataDrivenFuncs = [];
-
-        foreach (var platform in AllPlatforms())
-        {
-            foreach (var obj in data)
-            {
-                dataDrivenFuncs.Add(() => new DataDrivenData
-                {
-                    Data = (int)obj,
-                    RequestedPlatform = platform()
-                });
-            }
-        }
-
-        return dataDrivenFuncs;
-    }
 }
 /*
 * Copyright Andrew Gray, SauceForge