Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions dotnet/test/remote/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@ load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package")
dotnet_nunit_test_suite(
name = "remote",
size = "large",
srcs = glob(["**/*.cs"]),
srcs = glob(
["**/*.cs"],
exclude = [
"bin/**",
"obj/**",
],
),
out = "WebDriver.Remote.Tests",
browsers = ["remote"],
data = [
"//dotnet/test/webdriver:test-data",
],
flaky = True,
project_sdk = "web",
target_frameworks = ["net8.0"],
target_frameworks = ["net10.0"],
deps = [
"//dotnet/src/webdriver:webdriver-net8.0",
"//dotnet/test/testing.webserver",
Expand Down
2 changes: 1 addition & 1 deletion dotnet/test/remote/Selenium.WebDriver.Remote.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<AssemblyName>WebDriver.Remote.Tests</AssemblyName>
</PropertyGroup>

Expand Down
10 changes: 8 additions & 2 deletions dotnet/test/support/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@ load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package")
dotnet_nunit_test_suite(
name = "support",
size = "large",
srcs = glob(["**/*.cs"]),
srcs = glob(
["**/*.cs"],
exclude = [
"bin/**",
"obj/**",
],
),
browsers = [
"firefox",
],
data = [
"//dotnet/test/webdriver:test-data",
],
project_sdk = "web",
target_frameworks = ["net8.0"],
target_frameworks = ["net10.0"],
deps = [
"//dotnet/src/support",
"//dotnet/src/webdriver:webdriver-net8.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<AssemblyName>WebDriver.Support.Tests</AssemblyName>
<RootNamespace>OpenQA.Selenium.Support.Tests</RootNamespace>
</PropertyGroup>
Expand Down
10 changes: 8 additions & 2 deletions dotnet/test/testing.webserver/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@ load("//dotnet:defs.bzl", "csharp_library")
csharp_library(
name = "testing.webserver",
testonly = True,
srcs = glob(["**/*.cs"]),
srcs = glob(
["**/*.cs"],
exclude = [
"bin/**",
"obj/**",
],
),
out = "Testing.WebServer",
data = [
"//common/src/web",
],
nullable = "enable",
project_sdk = "web",
run_analyzers = False,
target_frameworks = ["net8.0"],
target_frameworks = ["net10.0"],
visibility = [
"//dotnet/test:__subpackages__",
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<AssemblyName>Testing.WebServer</AssemblyName>
<RootNamespace>OpenQA.Selenium.Testing.WebServer</RootNamespace>
<Nullable>enable</Nullable>
Expand Down
10 changes: 8 additions & 2 deletions dotnet/test/webdriver/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ filegroup(
dotnet_nunit_test_suite(
name = "webdriver",
size = "small",
srcs = glob(["**/*.cs"]),
srcs = glob(
["**/*.cs"],
exclude = [
"bin/**",
"obj/**",
],
),
out = "WebDriver.Tests",
browsers = [
# The first browser in this list is assumed to be the one that should
Expand All @@ -38,7 +44,7 @@ dotnet_nunit_test_suite(
":test-data",
],
project_sdk = "web",
target_frameworks = ["net8.0"],
target_frameworks = ["net10.0"],
visibility = ["//dotnet/test:__subpackages__"],
deps = [
"//dotnet/src/webdriver:webdriver-net8.0",
Expand Down
4 changes: 2 additions & 2 deletions dotnet/test/webdriver/Infrastructure/IgnoreTargetAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ private static bool IgnoreTestForPlatform(string platformToIgnore)

private static string CurrentPlatform()
{
#if NET8_0
return "net8";
#if NET10_0
return "net10";
#else
#error Update IgnoreTargetAttribute.CurrentPlatform to the current TFM
#endif
Expand Down
2 changes: 1 addition & 1 deletion dotnet/test/webdriver/Selenium.WebDriver.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<AssemblyName>WebDriver.Tests</AssemblyName>
<RootNamespace>OpenQA.Selenium.Tests</RootNamespace>
</PropertyGroup>
Expand Down
16 changes: 8 additions & 8 deletions dotnet/test/webdriver/TakesScreenshotTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void GetScreenshotAsBinary()
[IgnoreBrowser(Browser.Firefox, "Not working properly in RBE, works locally with pinned browsers")]
public void ShouldCaptureScreenshotOfCurrentViewport()
{
#if NET8_0
#if NET10_0
Assert.Ignore("Skipping test: this framework can not process colors.");
#endif

Expand Down Expand Up @@ -114,7 +114,7 @@ public void ShouldCaptureScreenshotOfCurrentViewport()
[IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")]
public void ShouldTakeScreenshotsOfAnElement()
{
#if NET8_0
#if NET10_0
Assert.Ignore("Skipping test: this framework can not process colors.");
#endif

Expand Down Expand Up @@ -142,7 +142,7 @@ public void ShouldTakeScreenshotsOfAnElement()
[IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")]
public void ShouldCaptureScreenshotAtFramePage()
{
#if NET8_0
#if NET10_0
Assert.Ignore("Skipping test: this framework can not process colors.");
#endif

Expand Down Expand Up @@ -186,7 +186,7 @@ public void ShouldCaptureScreenshotAtFramePage()
[IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")]
public void ShouldCaptureScreenshotAtIFramePage()
{
#if NET8_0
#if NET10_0
Assert.Ignore("Skipping test: this framework can not process colors.");
#endif

Expand Down Expand Up @@ -228,7 +228,7 @@ public void ShouldCaptureScreenshotAtIFramePage()
[IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")]
public void ShouldCaptureScreenshotAtFramePageAfterSwitching()
{
#if NET8_0
#if NET10_0
Assert.Ignore("Skipping test: this framework can not process colors.");
#endif

Expand Down Expand Up @@ -268,7 +268,7 @@ public void ShouldCaptureScreenshotAtFramePageAfterSwitching()
[IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")]
public void ShouldCaptureScreenshotAtIFramePageAfterSwitching()
{
#if NET6_0 || NET8_0
#if NET10_0
Assert.Ignore("Skipping test: this framework can not process colors.");
#endif

Expand Down Expand Up @@ -343,7 +343,7 @@ private HashSet<string> ScanActualColors(Screenshot screenshot, int stepX, int s
{
HashSet<string> colors = new HashSet<string>();

#if !NET8_0
#if !NET10_0
Comment thread
nvborisenko marked this conversation as resolved.
try
{
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
Expand Down Expand Up @@ -377,7 +377,7 @@ private Color GetPixelColor(Screenshot screenshot, int x, int y)
{
Color pixelColor = Color.Black;

#if !NET8_0
#if !NET10_0
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
Bitmap bitmap = new Bitmap(image);
pixelColor = bitmap.GetPixel(1, 1);
Expand Down
Loading