Skip to content

Commit cbea41d

Browse files
papafepapafe
committed
Small improvements
1 parent e710b13 commit cbea41d

File tree

2 files changed

+34
-19
lines changed

2 files changed

+34
-19
lines changed

‎src/MongoDB.Driver/Core/Connections/Socks5AuthenticationSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public abstract class Socks5AuthenticationSettings
3131
/// <summary>
3232
/// Creates authentication settings for username and password.
3333
/// </summary>
34-
/// <param name="username"></param>
35-
/// <param name="password"></param>
34+
/// <param name="username">The username</param>
35+
/// <param name="password">The password</param>
3636
/// <returns></returns>
3737
public static Socks5AuthenticationSettings UsernamePassword(string username, string password)
3838
=> new UsernamePasswordAuthenticationSettings(username, password);

‎tests/MongoDB.Driver.Tests/Specifications/socks5-support/Socks5SupportProseTests.cs

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,30 @@ namespace MongoDB.Driver.Tests.Specifications.socks5_support
2525
[Trait("Category", "Integration")]
2626
public class Socks5SupportProseTests(ITestOutputHelper testOutputHelper) : LoggableTestClass(testOutputHelper)
2727
{
28-
//TODO Need be sure that the connection string tests are run.
29-
30-
3128
[Theory]
32-
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1080&directConnection=true", false)]
33-
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1081&directConnection=true", true)]
34-
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1080", false)]
35-
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1081", true)]
36-
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1080&proxyUsername=nonexistentuser&proxyPassword=badauth&directConnection=true", false)]
37-
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1081&proxyUsername=nonexistentuser&proxyPassword=badauth&directConnection=true", true)]
38-
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1081&proxyUsername=nonexistentuser&proxyPassword=badauth", true)]
39-
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1080&proxyUsername=username&proxyPassword=p4ssw0rd&directConnection=true", true)]
40-
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1081&directConnection=true", true)]
41-
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1080&proxyUsername=username&proxyPassword=p4ssw0rd", true)]
42-
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1081", true)]
43-
public async Task TestConnectionStrings(string connectionString, bool expectedResult)
29+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1080&directConnection=true", false, false)]
30+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1080&directConnection=true", false, true)]
31+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1081&directConnection=true", true, false)]
32+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1081&directConnection=true", true, true)]
33+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1080", false, false)]
34+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1080", false, true)]
35+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1081", true, false)]
36+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1081", true, true)]
37+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1080&proxyUsername=nonexistentuser&proxyPassword=badauth&directConnection=true", false, false)]
38+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1080&proxyUsername=nonexistentuser&proxyPassword=badauth&directConnection=true", false, true)]
39+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1081&proxyUsername=nonexistentuser&proxyPassword=badauth&directConnection=true", true, false)]
40+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1081&proxyUsername=nonexistentuser&proxyPassword=badauth&directConnection=true", true, true)]
41+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1081&proxyUsername=nonexistentuser&proxyPassword=badauth", true, false)]
42+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1081&proxyUsername=nonexistentuser&proxyPassword=badauth", true, true)]
43+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1080&proxyUsername=username&proxyPassword=p4ssw0rd&directConnection=true", true, false)]
44+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1080&proxyUsername=username&proxyPassword=p4ssw0rd&directConnection=true", true, true)]
45+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1081&directConnection=true", true, false)]
46+
[InlineData("mongodb://<mappedhost>/?proxyHost=localhost&proxyPort=1081&directConnection=true", true, true)]
47+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1080&proxyUsername=username&proxyPassword=p4ssw0rd", true, false)]
48+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1080&proxyUsername=username&proxyPassword=p4ssw0rd", true, true)]
49+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1081", true, false)]
50+
[InlineData("mongodb://<replicaset>/?proxyHost=localhost&proxyPort=1081", true, true)]
51+
public async Task TestConnectionStrings(string connectionString, bool expectedResult, bool async)
4452
{
4553
connectionString = connectionString.Replace("<mappedhost>", "localhost:27017").Replace("<replicaset>", "localhost:27017");
4654
var mongoClientSettings = MongoClientSettings.FromConnectionString(connectionString);
@@ -50,14 +58,21 @@ public async Task TestConnectionStrings(string connectionString, bool expectedRe
5058
var database = client.GetDatabase("admin");
5159
var command = new BsonDocument("hello", 1);
5260

61+
5362
if (expectedResult)
5463
{
55-
var result = await database.RunCommandAsync<BsonDocument>(command);
64+
var result = async
65+
? await database.RunCommandAsync<BsonDocument>(command)
66+
: database.RunCommand<BsonDocument>(command);
67+
5668
Assert.NotEmpty(result);
5769
}
5870
else
5971
{
60-
var exception = Record.Exception(() => database.RunCommand<BsonDocument>(command));
72+
var exception = async
73+
? await Record.ExceptionAsync(() => database.RunCommandAsync<BsonDocument>(command))
74+
: Record.Exception(() => database.RunCommand<BsonDocument>(command));
75+
6176
Assert.IsType<TimeoutException>(exception);
6277
}
6378

0 commit comments

Comments
 (0)