Feat/dojo improvement (#207)

* dojo improvement

* add external tests

* target real devices

* fix asserts

* prepare next tunit release

* prepare next release

.github/workflows/pipeline.yml

@@ -337,7 +337,12 @@ jobs:
 
   tunit-real-integration-tests:
     runs-on: ubuntu-latest
-    needs: tunit-integration-tests
+    needs: [nunit-integration-tests,
+            xunit-integration-tests,
+            xunit-external-tests,
+            nunit-external-tests,
+            xunit-real-external-tests,
+            nunit-real-external-tests]
 
     steps:
     - name: Checkout Code
@@ -372,7 +377,8 @@ jobs:
 
   tunit-external-tests:
     runs-on: ubuntu-latest
-    needs: tunit-real-integration-tests
+    needs: [tunit-real-integration-tests, 
+            tunit-integration-tests]
 
     steps:
     - name: Checkout Code
@@ -392,7 +398,8 @@ jobs:
 
   tunit-real-external-tests:
     runs-on: ubuntu-latest
-    needs: tunit-external-tests
+    needs: [tunit-real-integration-tests, 
+            tunit-integration-tests]
 
     steps:
     - name: Checkout Code
@@ -412,18 +419,7 @@ jobs:
 
   generate-report:
     runs-on: ubuntu-latest
-    needs: [build, 
-            nunit-integration-tests,        
-            xunit-integration-tests, 
-            nunit-real-integration-tests,
-            xunit-real-integration-tests,
-            nunit-external-tests,
-            xunit-external-tests, 
-            nunit-real-external-tests,
-            xunit-real-external-tests,
-            tunit-integration-tests,
-            tunit-real-integration-tests,
-            tunit-external-tests,
+    needs: [tunit-external-tests,
             tunit-real-external-tests]
 
     steps:

ExternalMerlin.TUnit.RealDevices/ClickLinkTests.cs

@@ -0,0 +1,31 @@
+using ExternalMerlin.TUnit.RealDevices;
+using Saucery.Core.Dojo;
+using Saucery.Tests.Common.PageObjects;
+using Saucery.TUnit;
+using Shouldly;
+
+[assembly: ParallelLimiter<MyParallelLimit>]
+
+namespace ExternalMerlin.TUnit.RealDevices;
+
+public class ClickLinkTests : SauceryTBase
+{
+    [Test]
+    [MethodDataSource(typeof(RequestedPlatformData), nameof(RequestedPlatformData.AllPlatforms))]
+    public async Task ClickLinkTest(BrowserVersion requestedPlatform)
+    {
+        InitialiseDriver(requestedPlatform);
+
+        var guineaPigPage = new GuineaPigPage(SauceryDriver(), "https://saucelabs.com/");
+
+        guineaPigPage.ClickLink(SauceryDriver());
+
+        // verify the browser was navigated to the correct page
+        await Assert.That(Driver!.Url).Contains("saucelabs.com/test-guinea-pig2.html");
+    }
+}
+/*
+* Copyright Andrew Gray, SauceForge
+* Date: 7th December 2024
+* 
+*/

ExternalMerlin.TUnit.RealDevices/DataDrivenTests.cs

@@ -0,0 +1,35 @@
+using Saucery.Core.Dojo;
+using Saucery.Tests.Common.PageObjects;
+using Saucery.TUnit;
+
+namespace ExternalMerlin.TUnit.RealDevices;
+
+public class DataDrivenTests : SauceryTBase
+{
+    [Test]
+    [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])]
+    public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
+    {
+        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);
+}
+
+/*
+* Copyright Andrew Gray, SauceForge
+* Date: 7th December 2024
+* 
+*/

ExternalMerlin.TUnit.RealDevices/ExternalMerlin.TUnit.RealDevices.csproj

@@ -6,4 +6,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Saucery.TUnit" Version="0.5.6" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Saucery.Tests.Common\Saucery.Tests.Common.csproj" />
+  </ItemGroup>
+
 </Project>

ExternalMerlin.TUnit.RealDevices/MyParallelLimit.cs

@@ -0,0 +1,8 @@
+using TUnit.Core.Interfaces;
+
+namespace ExternalMerlin.TUnit.RealDevices;
+
+public record MyParallelLimit : IParallelLimit
+{
+    public int Limit => 3;
+}

ExternalMerlin.TUnit.RealDevices/RequestedPlatformData.cs

@@ -0,0 +1,29 @@
+using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
+using Saucery.Core.OnDemand;
+using Saucery.Core.OnDemand.Base;
+
+namespace ExternalMerlin.TUnit.RealDevices;
+
+public class RequestedPlatformData : SauceryTestData
+{
+    static RequestedPlatformData()
+    {
+        var platforms = new List<SaucePlatform>
+        {
+            //Real Devices
+            new AndroidRealDevice("Google.*", "15"),
+            new IOSRealDevice("iPhone 14 Pro Max", "16"),
+        };
+
+        SetPlatforms(platforms);
+    }
+
+    public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();
+    public static List<BrowserVersion> AllPlatformsAsList() => GetAllPlatformsAsList();
+}
+/*
+* Copyright Andrew Gray, SauceForge
+* Date: 12th July 2024
+* 
+*/

ExternalMerlin.TUnit/ClickLinkTests.cs

@@ -0,0 +1,31 @@
+using ExternalMerlin.TUnit;
+using Saucery.Core.Dojo;
+using Saucery.Tests.Common.PageObjects;
+using Saucery.TUnit;
+using Shouldly;
+
+[assembly: ParallelLimiter<MyParallelLimit>]
+
+namespace ExternalMerlin.TUnit;
+
+public class ClickLinkTests : SauceryTBase
+{
+    [Test]
+    [MethodDataSource(typeof(RequestedPlatformData), nameof(RequestedPlatformData.AllPlatforms))]
+    public async Task ClickLinkTest(BrowserVersion requestedPlatform)
+    {
+        InitialiseDriver(requestedPlatform);
+
+        var guineaPigPage = new GuineaPigPage(SauceryDriver(), "https://saucelabs.com/");
+
+        guineaPigPage.ClickLink(SauceryDriver());
+
+        // verify the browser was navigated to the correct page
+        await Assert.That(Driver!.Url).Contains("saucelabs.com/test-guinea-pig2.html");
+    }
+}
+/*
+* Copyright Andrew Gray, SauceForge
+* Date: 7th December 2024
+* 
+*/

ExternalMerlin.TUnit/DataDrivenTests.cs

@@ -0,0 +1,35 @@
+using Saucery.Core.Dojo;
+using Saucery.Tests.Common.PageObjects;
+using Saucery.TUnit;
+
+namespace ExternalMerlin.TUnit;
+
+public class DataDrivenTests : SauceryTBase
+{
+    [Test]
+    [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])]
+    public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
+    {
+        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);
+}
+
+/*
+* Copyright Andrew Gray, SauceForge
+* Date: 7th December 2024
+* 
+*/

ExternalMerlin.TUnit/ExternalMerlin.TUnit.csproj

@@ -6,4 +6,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Saucery.TUnit" Version="0.5.6" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Saucery.Tests.Common\Saucery.Tests.Common.csproj" />
+  </ItemGroup>
+
 </Project>

ExternalMerlin.TUnit/MyParallelLimit.cs

@@ -0,0 +1,8 @@
+using TUnit.Core.Interfaces;
+
+namespace ExternalMerlin.TUnit;
+
+public record MyParallelLimit : IParallelLimit
+{
+    public int Limit => 3;
+}

ExternalMerlin.TUnit/RequestedPlatformData.cs

@@ -0,0 +1,34 @@
+using Saucery.Core.DataSources;
+using Saucery.Core.Dojo;
+using Saucery.Core.OnDemand;
+using Saucery.Core.OnDemand.Base;
+using Saucery.Core.Util;
+
+namespace ExternalMerlin.TUnit;
+
+public class RequestedPlatformData : SauceryTestData
+{
+    static RequestedPlatformData()
+    {
+        var platforms = new List<SaucePlatform>
+        {
+            //Emulated Mobile Platforms
+            new AndroidPlatform("Google Pixel 8 Pro GoogleAPI Emulator", "15.0", SauceryConstants.DEVICE_ORIENTATION_PORTRAIT),
+            new IOSPlatform("iPhone 14 Pro Max Simulator", "16.2", SauceryConstants.DEVICE_ORIENTATION_LANDSCAPE),
+
+            //Desktop Platforms
+            new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_11, SauceryConstants.BROWSER_CHROME, "123"),
+            new DesktopPlatform(SauceryConstants.PLATFORM_WINDOWS_10, SauceryConstants.BROWSER_CHROME, "124", SauceryConstants.SCREENRES_2560_1600)
+        };
+
+        SetPlatforms(platforms);
+    }
+
+    public static List<Func<BrowserVersion>> AllPlatforms() => GetAllPlatformsAsFunc();
+    public static List<BrowserVersion> AllPlatformsAsList() => GetAllPlatformsAsList();
+}
+/*
+* Copyright Andrew Gray, SauceForge
+* Date: 12th July 2024
+* 
+*/

Merlin.TUnit.RealDevices/ClickLinkTests.cs

@@ -21,7 +21,7 @@ public async Task ClickLinkTest(BrowserVersion requestedPlatform)
         guineaPigPage.ClickLink(SauceryDriver());
 
         // verify the browser was navigated to the correct page
-        Driver!.Url.ShouldContain("saucelabs.com/test-guinea-pig2.html");
+        await Assert.That(Driver!.Url).Contains("saucelabs.com/test-guinea-pig2.html");
     }
 }
 /*

Merlin.TUnit.RealDevices/DataDrivenTests.cs

@@ -7,26 +7,25 @@ namespace Merlin.TUnit.RealDevices;
 public class DataDrivenTests : SauceryTBase
 {
     [Test]
-    [MethodDataSource(nameof(AllCombinations), Arguments = [ new[] { 4, 5 } ])]
+    [MethodDataSource(nameof(AllCombinations), Arguments = [new[] { 4, 5 }])]
     public async Task DataDrivenTest(BrowserVersion requestedPlatform, int data)
     {
         InitialiseDriver(requestedPlatform);
 
         var guineaPigPage = new GuineaPigPage(SauceryDriver(), "https://saucelabs.com/");
 
         guineaPigPage.TypeField(SauceryDriver(), "comments", data.ToString());
-    }
 
-    public static IEnumerable<(BrowserVersion, int)> AllCombinations(int[] data)
-    {
-        foreach (var browserVersion in RequestedPlatformData.AllPlatformsAsList())
-        {
-            foreach (var datum in data)
-            {
-                yield return (browserVersion, datum);
-            }
-        }
+        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);
 }
 
 /*

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.6" />
+		<PackageReference Include="TUnit" Version="0.5.22" />
 	</ItemGroup>
 
 	<ItemGroup>

Merlin.TUnit/ClickLinkTests.cs

@@ -21,7 +21,7 @@ public async Task ClickLinkTest(BrowserVersion requestedPlatform)
         guineaPigPage.ClickLink(SauceryDriver());
 
         // verify the browser was navigated to the correct page
-        Driver!.Url.ShouldContain("saucelabs.com/test-guinea-pig2.html");
+        await Assert.That(Driver!.Url).Contains("saucelabs.com/test-guinea-pig2.html");
     }
 }
 /*