Skip to content

Commit e9eac42

Browse files
jochenwezeljochenwezel
committed
upgraded NUnit 3.x to 4.x
1 parent 4c8d742 commit e9eac42

15 files changed

Lines changed: 1482 additions & 1468 deletions

‎CompuMaster.Test.Tools.Data/CompuMaster.Test.Data.vbproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6.0;net8.0;net48</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;net48</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<RootNamespace />
77
<AssemblyName>CompuMaster.Test.Tools.Data</AssemblyName>
@@ -102,12 +102,12 @@
102102

103103
<ItemGroup>
104104
<PackageReference Include="CompuMaster.Web.TinyWebServerAdvanced" Version="2021.7.28.100" />
105-
<PackageReference Include="CompuMaster.Data.XlsEpplus" Version="3.0.2024.1104" />
106-
<PackageReference Include="JUnitTestLogger4GitHub" Version="1.1.1" />
105+
<PackageReference Include="CompuMaster.Data.XlsEpplus" Version="3.0.2025.1230" />
106+
<PackageReference Include="JUnitTestLogger4GitHub" Version="1.1.3" />
107107
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
108108
<PackageReference Include="Npgsql" Version="6.0.11" />
109-
<PackageReference Include="NUnit" Version="3.14.0" />
110-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
109+
<PackageReference Include="NUnit" Version="4.4.0" />
110+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
111111
<PackageReference Include="System.Data.Odbc" Version="6.0.0" />
112112
<PackageReference Include="System.Data.OleDb" Version="6.0.0" />
113113
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />

‎CompuMaster.Test.Tools.Data/CsvTest.vb‎

Lines changed: 423 additions & 422 deletions
Large diffs are not rendered by default.

‎CompuMaster.Test.Tools.Data/DataQuery.AnyIDataProviderTest.vb‎

Lines changed: 62 additions & 61 deletions
Large diffs are not rendered by default.

‎CompuMaster.Test.Tools.Data/DataQuery.ConnectionsTest.vb‎

Lines changed: 78 additions & 77 deletions
Large diffs are not rendered by default.

‎CompuMaster.Test.Tools.Data/DataQuery.DataProviderTest.vb‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Imports NUnit.Framework
2+
Imports NUnit.Framework.Legacy
23
Imports System
34
Imports System.Collections.Generic
45
Imports System.Diagnostics
@@ -44,64 +45,64 @@ Namespace CompuMaster.Test.Data.DataQuery
4445
For Each MyProvider As CompuMaster.Data.DataQuery.DataProvider In providers
4546
Console.WriteLine(MyProvider.Title & " - " & MyProvider.ConnectionType.FullName & " - " & MyProvider.Assembly.FullName)
4647
Next
47-
Assert.GreaterOrEqual(providers.Count, 3)
48+
ClassicAssert.GreaterOrEqual(providers.Count, 3)
4849
End Sub
4950

5051
<Test> Public Sub LookupDataProviderTest()
5152
Dim provider As CompuMaster.Data.DataQuery.DataProvider
5253

5354
provider = CompuMaster.Data.DataQuery.DataProvider.LookupDataProvider("gibt es nicht")
54-
Assert.IsNull(provider)
55+
ClassicAssert.IsNull(provider)
5556

5657
provider = CompuMaster.Data.DataQuery.DataProvider.LookupDataProvider("ODBC")
57-
Assert.IsNotNull(provider)
58-
Assert.AreEqual(GetType(System.Data.Odbc.OdbcConnection), provider.CreateConnection.GetType)
59-
Assert.AreEqual(GetType(System.Data.Odbc.OdbcCommand), provider.CreateCommand.GetType)
60-
Assert.IsNotNull(provider.CreateCommandBuilder)
61-
Assert.AreEqual(GetType(System.Data.Odbc.OdbcCommandBuilder), provider.CreateCommandBuilder.GetType)
62-
Assert.IsNotNull(provider.CreateDataAdapter)
63-
Assert.AreEqual(GetType(System.Data.Odbc.OdbcDataAdapter), provider.CreateDataAdapter.GetType)
58+
ClassicAssert.IsNotNull(provider)
59+
ClassicAssert.AreEqual(GetType(System.Data.Odbc.OdbcConnection), provider.CreateConnection.GetType)
60+
ClassicAssert.AreEqual(GetType(System.Data.Odbc.OdbcCommand), provider.CreateCommand.GetType)
61+
ClassicAssert.IsNotNull(provider.CreateCommandBuilder)
62+
ClassicAssert.AreEqual(GetType(System.Data.Odbc.OdbcCommandBuilder), provider.CreateCommandBuilder.GetType)
63+
ClassicAssert.IsNotNull(provider.CreateDataAdapter)
64+
ClassicAssert.AreEqual(GetType(System.Data.Odbc.OdbcDataAdapter), provider.CreateDataAdapter.GetType)
6465
Console.WriteLine("ODBC WORKING")
6566

6667
provider = CompuMaster.Data.DataQuery.DataProvider.LookupDataProvider("OleDb")
6768
Dim IsMonoRuntime As Boolean = Type.GetType("Mono.Runtime") IsNot Nothing
6869
If IsMonoRuntime AndAlso System.Environment.OSVersion.Platform <> PlatformID.Win32NT Then
69-
Assert.IsNull(provider)
70+
ClassicAssert.IsNull(provider)
7071
Console.WriteLine("OleDb NOT SUPPORTED at Mono/" & System.Environment.OSVersion.Platform.ToString)
7172
ElseIf Not IsMonoRuntime AndAlso System.Environment.OSVersion.Platform <> PlatformID.Win32NT Then
72-
Assert.IsTrue(provider.Title = "OleDb")
73+
ClassicAssert.IsTrue(provider.Title = "OleDb")
7374
Try
7475
provider.CreateConnection()
75-
Assert.Fail("Expected exception")
76+
ClassicAssert.Fail("Expected exception")
7677
Catch ex As Exception
7778
If ex.GetType Is GetType(PlatformNotSupportedException) OrElse (
7879
ex.InnerException IsNot Nothing AndAlso ex.InnerException.GetType Is GetType(PlatformNotSupportedException)
7980
) Then
8081
'test passed :-)
8182
Console.WriteLine("OleDb NOT SUPPORTED at Non-Windows-Platform " & System.Environment.OSVersion.Platform.ToString)
8283
Else
83-
Assert.Fail("Unexpected exception type " & ex.GetType.FullName)
84+
ClassicAssert.Fail("Unexpected exception type " & ex.GetType.FullName)
8485
End If
8586
End Try
8687
Else
87-
Assert.IsNotNull(provider)
88-
Assert.AreEqual(GetType(System.Data.OleDb.OleDbConnection), provider.CreateConnection.GetType)
89-
Assert.AreEqual(GetType(System.Data.OleDb.OleDbCommand), provider.CreateCommand.GetType)
90-
Assert.IsNotNull(provider.CreateCommandBuilder)
91-
Assert.AreEqual(GetType(System.Data.OleDb.OleDbCommandBuilder), provider.CreateCommandBuilder.GetType)
92-
Assert.IsNotNull(provider.CreateDataAdapter)
93-
Assert.AreEqual(GetType(System.Data.OleDb.OleDbDataAdapter), provider.CreateDataAdapter.GetType)
88+
ClassicAssert.IsNotNull(provider)
89+
ClassicAssert.AreEqual(GetType(System.Data.OleDb.OleDbConnection), provider.CreateConnection.GetType)
90+
ClassicAssert.AreEqual(GetType(System.Data.OleDb.OleDbCommand), provider.CreateCommand.GetType)
91+
ClassicAssert.IsNotNull(provider.CreateCommandBuilder)
92+
ClassicAssert.AreEqual(GetType(System.Data.OleDb.OleDbCommandBuilder), provider.CreateCommandBuilder.GetType)
93+
ClassicAssert.IsNotNull(provider.CreateDataAdapter)
94+
ClassicAssert.AreEqual(GetType(System.Data.OleDb.OleDbDataAdapter), provider.CreateDataAdapter.GetType)
9495
Console.WriteLine("OleDb WORKING")
9596
End If
9697

9798
provider = CompuMaster.Data.DataQuery.DataProvider.LookupDataProvider("SqlClient")
98-
Assert.IsNotNull(provider)
99-
Assert.AreEqual(GetType(System.Data.SqlClient.SqlConnection), provider.CreateConnection.GetType)
100-
Assert.AreEqual(GetType(System.Data.SqlClient.SqlCommand), provider.CreateCommand.GetType)
101-
Assert.IsNotNull(provider.CreateCommandBuilder)
102-
Assert.AreEqual(GetType(System.Data.SqlClient.SqlCommandBuilder), provider.CreateCommandBuilder.GetType)
103-
Assert.IsNotNull(provider.CreateDataAdapter)
104-
Assert.AreEqual(GetType(System.Data.SqlClient.SqlDataAdapter), provider.CreateDataAdapter.GetType)
99+
ClassicAssert.IsNotNull(provider)
100+
ClassicAssert.AreEqual(GetType(System.Data.SqlClient.SqlConnection), provider.CreateConnection.GetType)
101+
ClassicAssert.AreEqual(GetType(System.Data.SqlClient.SqlCommand), provider.CreateCommand.GetType)
102+
ClassicAssert.IsNotNull(provider.CreateCommandBuilder)
103+
ClassicAssert.AreEqual(GetType(System.Data.SqlClient.SqlCommandBuilder), provider.CreateCommandBuilder.GetType)
104+
ClassicAssert.IsNotNull(provider.CreateDataAdapter)
105+
ClassicAssert.AreEqual(GetType(System.Data.SqlClient.SqlDataAdapter), provider.CreateDataAdapter.GetType)
105106
Console.WriteLine("SqlClient WORKING")
106107
End Sub
107108

‎CompuMaster.Test.Tools.Data/DataQuery.TestFile.vb‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Imports NUnit.Framework
2+
Imports NUnit.Framework.Legacy
23
Imports System.Collections.Generic
34

45
Namespace CompuMaster.Test.Data.DataQuery
@@ -7,17 +8,17 @@ Namespace CompuMaster.Test.Data.DataQuery
78

89
Private Shared Sub CreateAndDispose(ByVal testFileType As CompuMaster.Data.DataQuery.TestFile.TestFileType)
910
Dim testFile As New CompuMaster.Data.DataQuery.TestFile(testFileType)
10-
Assert.IsTrue(System.IO.File.Exists(testFile.FilePath), "File exists")
11+
ClassicAssert.IsTrue(System.IO.File.Exists(testFile.FilePath), "File exists")
1112
Dim filepath As String = testFile.FilePath
1213
testFile.Dispose()
13-
Assert.IsFalse(System.IO.File.Exists(filepath), "File was deleted")
14+
ClassicAssert.IsFalse(System.IO.File.Exists(filepath), "File was deleted")
1415

1516
Dim cachedPath As String = Nothing
1617
Using tsFile As New CompuMaster.Data.DataQuery.TestFile(testFileType)
17-
Assert.IsTrue(System.IO.File.Exists(tsFile.FilePath), "File exists")
18+
ClassicAssert.IsTrue(System.IO.File.Exists(tsFile.FilePath), "File exists")
1819
cachedPath = tsFile.FilePath
1920
End Using
20-
Assert.IsFalse(System.IO.File.Exists(cachedPath), "File was deleted")
21+
ClassicAssert.IsFalse(System.IO.File.Exists(cachedPath), "File was deleted")
2122
End Sub
2223

2324
' <Test> Public Sub CreateAndDisposeMsAccess()

0 commit comments

Comments
 (0)