Skip to content

Commit f26e1ff

Browse files
SNOW-3560694 Post-CI-stabilization cleanup - fix xUnit2002;xUnit2008;xUnit1026;xUnit3003;xUnit1026;xUnit1025 (#1390)
1 parent 70b6125 commit f26e1ff

33 files changed

Lines changed: 161 additions & 117 deletions

Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheAsyncIT.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ public async Task TestCloseSessionAfterTimeout()
393393
await conn2.CloseAsync(CancellationToken.None);
394394
}
395395

396-
public static Task ConcurrentPoolingAsyncHelper(string connectionString, bool closeConnection, int tasksCount, int connectionsInTask, int abandonedConnectionsCount)
396+
internal static Task ConcurrentPoolingAsyncHelper(string connectionString, bool closeConnection, int tasksCount, int connectionsInTask, int abandonedConnectionsCount)
397397
{
398398
var tasks = new Task[tasksCount + 1];
399399
for (int i = 0; i < tasksCount; i++)

Snowflake.Data.Tests/IntegrationTests/SFPutGetTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ private static void VerifyFilesAreUploaded(DbConnection conn, ICollection<string
830830
}
831831
}
832832

833-
public async TaskOrValueTask DisposeAsync()
833+
private async TaskOrValueTask DisposeAsync()
834834
{
835835
using (var conn = new SnowflakeDbConnection(_fixture.ConnectionString))
836836
{
@@ -857,7 +857,7 @@ public async TaskOrValueTask DisposeAsync()
857857
}
858858
}
859859

860-
public async TaskOrValueTask InitializeAsync()
860+
private async TaskOrValueTask InitializeAsync()
861861
{
862862
// Base object's names on on worker thread id
863863
var suffix = Guid.NewGuid().ToString("N");

Snowflake.Data.Tests/PackageTests/MiniCorePackageIT.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public MiniCorePackageIT(ITestOutputHelper helper)
3232
private string _tempDir;
3333
private string _artifactsDir;
3434
private string _repoRoot;
35-
public void Setup()
35+
36+
private void Setup()
3637
{
3738
_repoRoot = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "../../../../"));
3839
_artifactsDir = Path.Combine(_repoRoot, "artifacts");
@@ -41,7 +42,8 @@ public void Setup()
4142
Directory.CreateDirectory(_artifactsDir);
4243
Directory.CreateDirectory(_tempDir);
4344
}
44-
public void TearDown()
45+
46+
private void TearDown()
4547
{
4648
try { Directory.Delete(_tempDir, true); } catch { }
4749
}

Snowflake.Data.Tests/Snowflake.Data.Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<LangVersion>13</LangVersion>
1616
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
1717
<OutputType Condition="'$(OldXunit)' != 'True'">Exe</OutputType>
18-
<!-- SNOW-3560694 !-->
19-
<NoWarn>$(NoWarn);xUnit1013;xUnit2003;xUnit2002;xUnit2008;xUnit1026;xUnit3003;xUnit1026;xUnit1025</NoWarn>
2018
</PropertyGroup>
2119
<ItemGroup>
2220
<Content Include="wiremock\**\*.*">

Snowflake.Data.Tests/UnitTests/Authenticator/ChallengeProviderTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void TestGenerateState()
1818

1919
// assert
2020
Assert.Equal(32, state.Length);
21-
Assert.True(_onlyDigitsOrNumbers.IsMatch(state));
21+
Assert.Matches(_onlyDigitsOrNumbers, state);
2222
}
2323

2424
[SFFact]
@@ -29,7 +29,7 @@ public void TestGenerateCodeVerifier()
2929

3030
// assert
3131
Assert.InRange(codeVerifier.Length, 43, 128);
32-
Assert.True(_onlyDigitsOrNumbers.IsMatch(codeVerifier));
32+
Assert.Matches(_onlyDigitsOrNumbers, codeVerifier);
3333
}
3434
}
3535
}

Snowflake.Data.Tests/UnitTests/Configuration/EasyLoggingConfigParserTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public EasyLoggingConfigParserTest(EasyLoggingConfigParserTestFixture fixture)
3131
{
3232
}
3333

34-
public static void BeforeAll()
34+
internal static void BeforeAll()
3535
{
3636
if (!Directory.Exists(s_workingDirectory))
3737
{

Snowflake.Data.Tests/UnitTests/CredentialManager/SFCredentialManagerFileImplTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public SFCredentialManagerFileImplTest()
3636
private static readonly string s_customLockPath = Path.Combine(CustomJsonDir, SFCredentialManagerFileStorage.CredentialCacheLockName);
3737

3838
private const int UserId = 1;
39-
public void SetUp()
39+
40+
private void SetUp()
4041
{
4142
t_fileOperations = new Mock<FileOperations>();
4243
t_directoryOperations = new Mock<DirectoryOperations>();

Snowflake.Data.Tests/UnitTests/CredentialManager/SnowflakeCredentialManagerFactoryTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Snowflake.Data.Tests.UnitTests.CredentialManager
99
{
1010
public class SnowflakeCredentialManagerFactoryTest : IDisposable
1111
{
12-
public void TearDown()
12+
private void TearDown()
1313
{
1414
SnowflakeCredentialManagerFactory.UseDefaultCredentialManager();
1515
}

Snowflake.Data.Tests/UnitTests/HttpUtilTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,9 @@ public void TestDefaultConnectionLimitIsNotChangedWhenOver50()
209209
public void TestDefaultConnectionLimitIsChangedToDefaultWhenUnder50()
210210
{
211211
// arrange
212+
#if NET9_0_OR_GREATER
213+
Skip.When(true, "TODO SNOW-3662960");
214+
#endif
212215
var originalLimit = ServicePointManager.DefaultConnectionLimit;
213216
ServicePointManager.DefaultConnectionLimit = 49;
214217

Snowflake.Data.Tests/UnitTests/Logger/EasyLoggingStarterTest.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,19 @@ public void TestThatThrowsErrorWhenLogPathIsNotSetAndHomeDirectoryThrowsAnExcept
142142

143143

144144
[SFTheory(SkipCondition.SkipOnWindows)]
145-
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.GroupExecute)]
146-
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.GroupWrite | FileAccessPermissions.GroupExecute)]
147-
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupReadWriteExecute | FileAccessPermissions.OtherRead | FileAccessPermissions.OtherExecute)]
148-
[InlineData(FileAccessPermissions.AllPermissions)]
149-
[InlineData(FileAccessPermissions.GroupReadWriteExecute)]
150-
[InlineData(FileAccessPermissions.OtherReadWriteExecute)]
151-
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.OtherRead)]
152-
[InlineData(FileAccessPermissions.UserRead | FileAccessPermissions.UserWrite)]
153-
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead)]
154-
public void TestThatThrowsErrorWhenLogDirectoryHasInvalidPermissions(FileAccessPermissions invalidPermissions)
145+
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.GroupExecute, "User RWX + Group RX")]
146+
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.GroupWrite | FileAccessPermissions.GroupExecute, "User RWX + Group RWX")]
147+
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupReadWriteExecute | FileAccessPermissions.OtherRead | FileAccessPermissions.OtherExecute, "User RWX + Group RWX + Other RX")]
148+
[InlineData(FileAccessPermissions.AllPermissions, "All")]
149+
[InlineData(FileAccessPermissions.GroupReadWriteExecute, "Group RWX")]
150+
[InlineData(FileAccessPermissions.OtherReadWriteExecute, "Other RWX")]
151+
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.OtherRead, "User RWX + Other R")]
152+
[InlineData(FileAccessPermissions.UserRead | FileAccessPermissions.UserWrite, "User RW")]
153+
[InlineData(FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead, "User RWX + Group R")]
154+
public void TestThatThrowsErrorWhenLogDirectoryHasInvalidPermissions(FileAccessPermissions invalidPermissions, string log)
155155
{
156156
// arrange
157+
Console.WriteLine($@"Executing {nameof(TestThatThrowsErrorWhenLogDirectoryHasInvalidPermissions)} with {log}..");
157158
t_easyLoggingProvider
158159
.Setup(provider => provider.ProvideConfig(ConfigPath))
159160
.Returns(s_configWithInfoLevel);

0 commit comments

Comments
 (0)