VB Tests: Use a copy of Northwind

Resolves #30820
dotnet · Jun 30, 2023 · 4ea0ee8 · 4ea0ee8
1 parent 81c2440
commit 4ea0ee8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/test/EFCore.VisualBasic.FunctionalTests/EFCore.VisualBasic.FunctionalTests.vbproj b/test/EFCore.VisualBasic.FunctionalTests/EFCore.VisualBasic.FunctionalTests.vbproj
@@ -4,8 +4,7 @@
     <RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
     <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>Microsoft.EntityFrameworkCore.VisualBasic.FunctionalTests</AssemblyName>
-    <!-- Skipping flaky tests due to #30820 -->
-    <SkipTests>True</SkipTests>
+    <SkipTests Condition="'$(OS)' != 'Windows_NT' AND '$(Test__SqlServer__DefaultConnection)' == ''">True</SkipTests>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/test/EFCore.VisualBasic.FunctionalTests/NorthwindQueryVisualBasicTest.vb b/test/EFCore.VisualBasic.FunctionalTests/NorthwindQueryVisualBasicTest.vb
@@ -7,9 +7,9 @@ Imports Microsoft.EntityFrameworkCore.TestUtilities
 Imports Xunit
 
 Partial Public Class NorthwindQueryVisualBasicTest
-    Inherits QueryTestBase(Of NorthwindQuerySqlServerFixture(Of NoopModelCustomizer))
+    Inherits QueryTestBase(Of NorthwindVBQuerySqlServerFixture(Of NoopModelCustomizer))
 
-    Public Sub New(fixture As NorthwindQuerySqlServerFixture(Of NoopModelCustomizer))
+    Public Sub New(fixture As NorthwindVBQuerySqlServerFixture(Of NoopModelCustomizer))
         MyBase.New(fixture)
 
         fixture.TestSqlLoggerFactory.Clear()
@@ -85,7 +85,7 @@ FROM [Products] AS [p]
 WHERE [p].[UnitsInStock] * CAST(1 AS smallint) = CAST(101 AS smallint)")
     End Sub
 
-    Protected Overrides Function CreateQueryAsserter(fixture As NorthwindQuerySqlServerFixture(Of NoopModelCustomizer)) As QueryAsserter
+    Protected Overrides Function CreateQueryAsserter(fixture As NorthwindVBQuerySqlServerFixture(Of NoopModelCustomizer)) As QueryAsserter
         Return New RelationalQueryAsserter(
             fixture, AddressOf RewriteExpectedQueryExpression, AddressOf RewriteServerQueryExpression, canExecuteQueryString:=True)
     End Function

diff --git a/test/EFCore.VisualBasic.FunctionalTests/NorthwindVBQuerySqlServerFixture.vb b/test/EFCore.VisualBasic.FunctionalTests/NorthwindVBQuerySqlServerFixture.vb
@@ -0,0 +1,15 @@
+' Licensed to the .NET Foundation under one or more agreements.
+' The .NET Foundation licenses this file to you under the MIT license.
+
+Imports Microsoft.EntityFrameworkCore.Infrastructure
+Imports Microsoft.EntityFrameworkCore.Query
+
+Public Class NorthwindVBQuerySqlServerFixture(Of TModelCustomizer As {IModelCustomizer, New})
+    Inherits NorthwindQuerySqlServerFixture(Of TModelCustomizer)
+
+    Protected Overrides ReadOnly Property StoreName As String
+        Get
+            Return "NorthwindVB"
+        End Get
+    End Property
+End Class