update nuget packages

ExternalMerlin.TUnit.RealDevices/DataDrivenTests.cs

@@ -8,9 +8,9 @@ public class DataDrivenTests : SauceryTBase
 {
     [Test]
     [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])]
-    public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
+    public async Task DataDrivenTest(Func<BrowserVersion> requestedPlatform, int data)
     {
-        InitialiseDriver(requestedPlatform);
+        InitialiseDriver(requestedPlatform());
 
         var guineaPigPage = new GuineaPigPage(SauceryDriver(), "https://saucelabs.com/");
 
@@ -23,9 +23,13 @@ public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
         await Assert.That(commentText).Contains(data.ToString());
     }
 
-    public static IEnumerable<(BrowserVersion, int)> AllCombinations(int[] data) => from browserVersion in RequestedPlatformData.AllPlatformsAsList()
-                                                                                    from datum in data
-                                                                                    select (browserVersion, datum);
+    public static IEnumerable<(Func<BrowserVersion>, int)> AllCombinations(int[] data) =>
+        RequestedPlatformData
+            .AllPlatforms()
+            .SelectMany(
+                _ => data,
+                (browserVersionFunc, datum) => (browserVersionFunc, datum)
+            );
 }
 
 /*

ExternalMerlin.TUnit.RealDevices/RequestedPlatformData.cs

@@ -20,7 +20,6 @@ static RequestedPlatformData()
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();
-    public static List<BrowserVersion> AllPlatformsAsList() => GetAllPlatformsAsList();
 }
 /*
 * Copyright Andrew Gray, SauceForge

ExternalMerlin.TUnit/DataDrivenTests.cs

@@ -8,9 +8,9 @@ public class DataDrivenTests : SauceryTBase
 {
     [Test]
     [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])]
-    public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
+    public async Task DataDrivenTest(Func<BrowserVersion> requestedPlatform, int data)
     {
-        InitialiseDriver(requestedPlatform);
+        InitialiseDriver(requestedPlatform());
 
         var guineaPigPage = new GuineaPigPage(SauceryDriver(), "https://saucelabs.com/");
 
@@ -23,9 +23,14 @@ public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
         await Assert.That(commentText).Contains(data.ToString());
     }
 
-    public static IEnumerable<(BrowserVersion, int)> AllCombinations(int[] data) => from browserVersion in RequestedPlatformData.AllPlatformsAsList()
-                                                                                    from datum in data
-                                                                                    select (browserVersion, datum);
+    public static IEnumerable<(Func<BrowserVersion>, int)> AllCombinations(int[] data) =>
+        RequestedPlatformData
+            .AllPlatforms()
+            .SelectMany(
+                _ => data,
+                (browserVersionFunc, datum) => (browserVersionFunc, datum)
+            );
+
 }
 
 /*

ExternalMerlin.TUnit/RequestedPlatformData.cs

@@ -25,7 +25,6 @@ static RequestedPlatformData()
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();
-    public static List<BrowserVersion> AllPlatformsAsList() => GetAllPlatformsAsList();
 }
 /*
 * Copyright Andrew Gray, SauceForge

Merlin.TUnit.RealDevices/DataDrivenTests.cs

@@ -8,9 +8,9 @@ public class DataDrivenTests : SauceryTBase
 {
     [Test]
     [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])]
-    public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
+    public async Task DataDrivenTest(Func<BrowserVersion> requestedPlatform, int data)
     {
-        InitialiseDriver(requestedPlatform);
+        InitialiseDriver(requestedPlatform());
 
         var guineaPigPage = new GuineaPigPage(SauceryDriver(), "https://saucelabs.com/");
 
@@ -23,9 +23,13 @@ public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
         await Assert.That(commentText).Contains(data.ToString());
     }
 
-    public static IEnumerable<(BrowserVersion, int)> AllCombinations(int[] data) => from browserVersion in RequestedPlatformData.AllPlatformsAsList()
-                                                                                    from datum in data
-                                                                                    select (browserVersion, datum);
+    public static IEnumerable<(Func<BrowserVersion>, int)> AllCombinations(int[] data) =>
+        RequestedPlatformData
+            .AllPlatforms()
+            .SelectMany(
+                _ => data,
+                (browserVersionFunc, datum) => (browserVersionFunc, datum)
+            );
 }
 
 /*

Merlin.TUnit.RealDevices/Merlin.TUnit.RealDevices.csproj

@@ -15,7 +15,7 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="TUnit" Version="0.5.32" />
+		<PackageReference Include="TUnit" Version="0.6.0" />
 	</ItemGroup>
 
 	<ItemGroup>

Merlin.TUnit.RealDevices/RequestedPlatformData.cs

@@ -20,7 +20,6 @@ static RequestedPlatformData()
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();
-    public static List<BrowserVersion> AllPlatformsAsList() => GetAllPlatformsAsList();
 }
 /*
 * Copyright Andrew Gray, SauceForge

Merlin.TUnit/DataDrivenTests.cs

@@ -8,9 +8,9 @@ public class DataDrivenTests : SauceryTBase
 {
     [Test]
     [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])]
-    public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
+    public async Task DataDrivenTest(Func<BrowserVersion> requestedPlatform, int data)
     {
-        InitialiseDriver(requestedPlatform);
+        InitialiseDriver(requestedPlatform());
 
         var guineaPigPage = new GuineaPigPage(SauceryDriver(), "https://saucelabs.com/");
 
@@ -23,9 +23,13 @@ public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
         await Assert.That(commentText).Contains(data.ToString());
     }
 
-    public static IEnumerable<(BrowserVersion, int)> AllCombinations(int[] data) => from browserVersion in RequestedPlatformData.AllPlatformsAsList()
-                                                                                    from datum in data
-                                                                                    select (browserVersion, datum);
+    public static IEnumerable<(Func<BrowserVersion>, int)> AllCombinations(int[] data) =>
+        RequestedPlatformData
+            .AllPlatforms()
+            .SelectMany(
+                _ => data,
+                (browserVersionFunc, datum) => (browserVersionFunc, datum)
+            );
 }
 
 /*

Merlin.TUnit/Merlin.TUnit.csproj

@@ -15,7 +15,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="TUnit" Version="0.5.32" />
+    <PackageReference Include="TUnit" Version="0.6.0" />
   </ItemGroup>
 
   <ItemGroup>

Merlin.TUnit/RequestedPlatformData.cs

@@ -37,7 +37,6 @@ static RequestedPlatformData()
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();
-    public static List<BrowserVersion> AllPlatformsAsList() => GetAllPlatformsAsList();
 }
 /*
 * Copyright Andrew Gray, SauceForge

README.md

@@ -305,7 +305,7 @@ Your Project file should look something like this:
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Saucery.TUnit" Version="0.5.22" />
+    <PackageReference Include="Saucery.TUnit" Version="0.6.0" />
   </ItemGroup>
 
 </Project>
@@ -322,30 +322,34 @@ using Saucery.Core.Dojo;
 using Saucery.Tests.Common.PageObjects;
 using Saucery.TUnit;
 
-namespace ExternalMerlin.TUnit;
+namespace Merlin.TUnit.RealDevices;
 
 public class DataDrivenTests : SauceryTBase
 {
     [Test]
-    [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])
-    public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
+    [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])]
+    public async Task DataDrivenTest(Func<BrowserVersion> requestedPlatform, int data)
     {
-        InitialiseDriver(requestedPlatform);
+        InitialiseDriver(requestedPlatform());
 
         var guineaPigPage = new GuineaPigPage(SauceryDriver(), "https://saucelabs.com/");
 
         guineaPigPage.TypeField(SauceryDriver(), "comments", data.ToString());
 
         var commentField = guineaPigPage.GetField(SauceryDriver(), "comments");
         await Assert.That(commentField).IsNotNull();
-        
+
         var commentText = commentField.GetDomProperty("value");
         await Assert.That(commentText).Contains(data.ToString());
     }
 
-    public static IEnumerable<(BrowserVersion, int)> AllCombinations(int[] data) => from browserVersion in RequestedPlatformData.AllPlatformsAsList()
-                                                                                    from datum in data
-                                                                                    select (browserVersion, datum);
+    public static IEnumerable<(Func<BrowserVersion>, int)> AllCombinations(int[] data) =>
+    RequestedPlatformData
+        .AllPlatforms()
+        .SelectMany(
+            browserVersionFunc => data,
+            (browserVersionFunc, datum) => (browserVersionFunc, datum)
+        );
 }
 ```
 
@@ -370,10 +374,10 @@ A data driven test is specified like this:
 ```
 [Test]
 [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])]
-public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
+public async Task DataDrivenTest(Func<BrowserVersion> requestedPlatform, int data)
 ```
 
-You can call the class what you like but it must take a `BrowserVersion` and the `data` as a parameter and subclass `SauceryTBase`.
+You can call the class what you like but it must take a `Func<BrowserVersion>` and the `data` as a parameter and subclass `SauceryTBase`.
 
 `[MethodDataSource(nameof(AllCombinations)...]` is how you tell SauceryT what platforms you want to test on. You need to specify a class to do that. In this example its called `RequestedPlatformData` but you can call it anything you like.
 
@@ -407,7 +411,6 @@ public class RequestedPlatformData : SauceryTestData
     }
 
     public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();
-    public static List<BrowserVersion> AllPlatformsAsList() => GetAllPlatformsAsList();
 ```
 
 The `List<SaucePlatform>` is what you will specify. The rest of the class is mandatory. Check out `SauceryConstants` for all the platform, browser and screenres enums.

Sandbox.TUnit/Sandbox.TUnit.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
 	<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
-    <PackageReference Include="TUnit" Version="0.5.32" />
+    <PackageReference Include="TUnit" Version="0.6.0" />
   </ItemGroup>
 
 </Project>

Saucery.Core/DataSources/SauceryTestData.cs

@@ -31,25 +31,8 @@ protected static IEnumerable<object[]> GetAllPlatforms() {
         return allPlatforms.AsEnumerable();
     }
 
-    protected static List<BrowserVersion> GetAllPlatformsAsList()
-    {
-        List<BrowserVersion> allPlatforms = [];
-        allPlatforms.AddRange(from platform in Items
-                              select platform);
-        return allPlatforms;
-    }
-
-    protected static List<Func<BrowserVersion>> GetAllPlatformsAsFunc()
-    {
-        var listOfFunc = new List<Func<BrowserVersion>>();
-
-        foreach (var platform in Items)
-        {
-            listOfFunc.Add(() => platform);
-        }
-
-        return listOfFunc;
-    }
+    protected static List<Func<BrowserVersion>> GetAllPlatformsAsFunc() => 
+        Items.Select(platform => (Func<BrowserVersion>)(() => platform)).ToList();
 }
 /*
 * Copyright Andrew Gray, SauceForge

Saucery.Core/Saucery.Core.csproj

@@ -26,7 +26,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Appium.WebDriver" Version="6.0.1" />
+		<PackageReference Include="Appium.WebDriver" Version="7.0.0" />
 		<PackageReference Include="Castle.Core" Version="5.1.1" />
 		<PackageReference Include="DotNetSeleniumExtras.PageObjects.Core" Version="4.14.1" />
 		<PackageReference Include="DotNetSeleniumExtras.WaitHelpers" Version="3.11.0" />

Saucery.TUnit/Saucery.TUnit.csproj

@@ -11,7 +11,7 @@
   <PropertyGroup>
 	<IsPackable>true</IsPackable>
 	<PackageId>Saucery.TUnit</PackageId>
-	<PackageVersion>0.5.22</PackageVersion>
+	<PackageVersion>0.6.0</PackageVersion>
 	<PackageReadmeFile>README.md</PackageReadmeFile>
 	<Authors>Andrew Gray</Authors>
 	<Company>SauceForge</Company>
@@ -29,8 +29,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TUnit" Version="0.5.32" />
-    <PackageReference Include="TUnit.Core" Version="0.5.32" />
+    <PackageReference Include="TUnit" Version="0.6.0" />
+    <PackageReference Include="TUnit.Core" Version="0.6.0" />
     <None Include="Images\Saucery.TUnit.128x128.png" Pack="true" PackagePath="\" />
     <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>