Skip to content

Commit c1a69af

Browse files
committed
Use the 4.0 server version instead of 3.7
Now that 4.0 is a release candidate, replace any reference to 3.7 with 4.0 in code and tests that need to compare against a server version.
1 parent a172874 commit c1a69af

File tree

14 files changed

+18
-45
lines changed

14 files changed

+18
-45
lines changed

driver-async/src/test/functional/com/mongodb/async/client/InitialDnsSeedlistDiscoveryTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ public void shouldDiscover() throws InterruptedException {
121121
final ConnectionString connectionString = new ConnectionString(uri);
122122
final SslSettings sslSettings = getSslSettings(connectionString);
123123

124-
assumeTrue(isDiscoverableReplicaSet() && !serverVersionAtLeast(3, 7)
125-
&& getSslSettings().isEnabled() == sslSettings.isEnabled());
124+
assumeTrue("It's not a replica set", isDiscoverableReplicaSet());
125+
assumeTrue("Server version is >= 4.0", !serverVersionAtLeast(4, 0));
126+
assumeTrue("SSL settings don't match", getSslSettings().isEnabled() == sslSettings.isEnabled());
126127

127128
com.mongodb.MongoClientSettings settings = com.mongodb.MongoClientSettings.builder()
128129
.applyToClusterSettings(new Block<ClusterSettings.Builder>() {

driver-async/src/test/functional/com/mongodb/async/client/MongoClientSessionSpecification.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
308308
}
309309

310310

311-
@IgnoreIf({ !serverVersionAtLeast(3, 7) || !isDiscoverableReplicaSet() })
311+
@IgnoreIf({ !serverVersionAtLeast(4, 0) || !isDiscoverableReplicaSet() })
312312
def 'should ignore unacknowledged write concern when in a transaction'() {
313313
given:
314314
def session = run(getMongoClient().&startSession)

driver-async/src/test/functional/com/mongodb/async/client/TransactionsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,6 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
427427
}
428428

429429
private boolean canRunTests() {
430-
return serverVersionAtLeast(3, 7) && isDiscoverableReplicaSet();
430+
return serverVersionAtLeast(4, 0) && isDiscoverableReplicaSet();
431431
}
432432
}

driver-core/src/main/com/mongodb/internal/connection/DefaultAuthenticator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
class DefaultAuthenticator extends Authenticator {
3838
static final int USER_NOT_FOUND_CODE = 11;
39-
private static final ServerVersion FOUR_ZERO = new ServerVersion(3, 7);
39+
private static final ServerVersion FOUR_ZERO = new ServerVersion(4, 0);
4040
private static final ServerVersion THREE_ZERO = new ServerVersion(3, 0);
4141
private static final BsonString DEFAULT_MECHANISM_NAME = new BsonString(SCRAM_SHA_256.getMechanismName());
4242

driver-core/src/main/com/mongodb/operation/UserOperationHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import static com.mongodb.internal.operation.WriteConcernHelper.hasWriteConcernError;
3737

3838
final class UserOperationHelper {
39-
private static final ServerVersion FOUR_ZERO = new ServerVersion(3, 7);
39+
private static final ServerVersion FOUR_ZERO = new ServerVersion(4, 0);
4040

4141
static BsonDocument asCommandDocument(final MongoCredential credential, final ConnectionDescription connectionDescription,
4242
final boolean readOnly, final String commandName) {

driver-core/src/test/functional/com/mongodb/operation/CreateCollectionOperationSpecification.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
171171
async << [true, false]
172172
}
173173

174-
@IgnoreIf({ serverVersionAtLeast(3, 7) })
174+
@IgnoreIf({ serverVersionAtLeast(4, 0) })
175175
def 'should create collection in respect to the autoIndex option'() {
176176
given:
177177
assert !collectionNameExists(getCollectionName())

driver-core/src/test/functional/com/mongodb/operation/DropUserOperationSpecification.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class DropUserOperationSpecification extends OperationFunctionalSpecification {
4949
async << [true, false]
5050
}
5151

52-
@IgnoreIf({ !serverVersionAtLeast(3, 7) })
52+
@IgnoreIf({ !serverVersionAtLeast(4, 0) })
5353
def 'should delete user without error SHA_256'() {
5454
given:
5555
def credential = createScramSha256Credential('userToDrop', databaseName, '123'.toCharArray())

driver-core/src/test/functional/com/mongodb/operation/ListCollectionsOperationSpecification.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import static com.mongodb.ClusterFixture.isSharded
5656
import static com.mongodb.ClusterFixture.serverVersionAtLeast
5757
import static java.util.concurrent.TimeUnit.MILLISECONDS
5858

59-
@IgnoreIf({ serverVersionAtLeast(3, 7) && isSharded() })
59+
@IgnoreIf({ serverVersionAtLeast(4, 0) && isSharded() })
6060
class ListCollectionsOperationSpecification extends OperationFunctionalSpecification {
6161

6262
def madeUpDatabase = 'MadeUpDatabase'

driver-core/src/test/functional/com/mongodb/operation/ListIndexesOperationSpecification.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import static com.mongodb.ClusterFixture.isSharded
5555
import static com.mongodb.ClusterFixture.serverVersionAtLeast
5656
import static java.util.concurrent.TimeUnit.MILLISECONDS
5757

58-
@IgnoreIf({ serverVersionAtLeast(3, 7) && isSharded() })
58+
@IgnoreIf({ serverVersionAtLeast(4, 0) && isSharded() })
5959
class ListIndexesOperationSpecification extends OperationFunctionalSpecification {
6060

6161
def 'should return empty list for nonexistent collection'() {

driver-core/src/test/functional/com/mongodb/operation/UserOperationsSpecification.groovy

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import org.bson.BsonDocument
4949
import org.bson.BsonInt32
5050
import org.bson.codecs.BsonDocumentCodec
5151
import org.junit.experimental.categories.Category
52-
import spock.lang.Ignore
5352
import spock.lang.IgnoreIf
5453

5554
import java.util.concurrent.TimeUnit
@@ -64,11 +63,9 @@ import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
6463
import static com.mongodb.ClusterFixture.isSharded
6564
import static com.mongodb.ClusterFixture.serverVersionAtLeast
6665
import static com.mongodb.MongoCredential.createCredential
67-
import static com.mongodb.MongoCredential.createScramSha256Credential
6866
import static com.mongodb.WriteConcern.ACKNOWLEDGED
6967
import static java.util.Arrays.asList
7068

71-
7269
class UserOperationsSpecification extends OperationFunctionalSpecification {
7370
def credential = createCredential('\u53f0\u5317', databaseName, 'Ta\u0301ibe\u030Ci'.toCharArray())
7471

@@ -105,32 +102,6 @@ class UserOperationsSpecification extends OperationFunctionalSpecification {
105102
async << [true, false]
106103
}
107104

108-
// TODO: Waiting on final spec changes for SASL Prep
109-
// @IgnoreIf({ !serverVersionAtLeast(3, 7) })
110-
@Ignore
111-
def 'should correctly, prep username and be able to authenticate users with unicode in their name'() {
112-
when:
113-
def user = createScramSha256Credential('IX', databaseName, authCredential.getPassword())
114-
execute(new CreateUserOperation(user, true), async)
115-
def cluster = getCluster(authCredential)
116-
def server = cluster.selectServer(new WritableServerSelector())
117-
def connection = server.getConnection()
118-
119-
then:
120-
!testConnection(connection).isEmpty()
121-
122-
cleanup:
123-
connection?.release()
124-
execute(new DropUserOperation(databaseName, user.userName), async)
125-
cluster?.close()
126-
127-
where:
128-
[async, authCredential] << [[true, false],
129-
[createCredential('I\u00ADX', databaseName, 'pass\u2010word' as char[]),
130-
createScramSha256Credential('I\u00ADX', databaseName, 'pass\u2010word' as char[]),
131-
createScramSha256Credential('\u2168', databaseName, 'pass\u2010word' as char[])]].combinations()
132-
}
133-
134105
def 'should handle user not found'() {
135106
given:
136107
def credential = createCredential('user', databaseName, 'pencil' as char[])

0 commit comments

Comments
 (0)