Skip to content

Commit 055d2d7

Browse files
rozzarozza
committed
Test: Standardize the timeouts
JAVA-3577
1 parent b9b3b9d commit 055d2d7

19 files changed

+54
-59
lines changed

‎driver-core/src/test/functional/com/mongodb/internal/async/client/Fixture.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import static com.mongodb.ClusterFixture.getSslSettings;
3333
import static com.mongodb.connection.ClusterType.SHARDED;
3434
import static java.lang.Thread.sleep;
35-
import static java.util.concurrent.TimeUnit.SECONDS;
3635

3736
/**
3837
* Helper class for asynchronous tests.
@@ -94,7 +93,7 @@ public static AsyncMongoCollection<Document> initializeCollection(final MongoNam
9493
try {
9594
FutureResultCallback<Document> futureResultCallback = new FutureResultCallback<Document>();
9695
database.runCommand(new Document("drop", namespace.getCollectionName()), futureResultCallback);
97-
futureResultCallback.get(60, SECONDS);
96+
futureResultCallback.get();
9897
} catch (MongoCommandException e) {
9998
if (!e.getErrorMessage().startsWith("ns not found")) {
10099
throw e;
@@ -118,7 +117,7 @@ public static void dropDatabase(final String name) {
118117
FutureResultCallback<Document> futureResultCallback = new FutureResultCallback<Document>();
119118
getMongoClient().getDatabase(name)
120119
.runCommand(new Document("dropDatabase", 1), futureResultCallback);
121-
futureResultCallback.get(60, SECONDS);
120+
futureResultCallback.get();
122121
} catch (MongoCommandException e) {
123122
if (!e.getErrorMessage().startsWith("ns not found")) {
124123
throw e;

‎driver-core/src/test/functional/com/mongodb/internal/async/client/ForEachSpecification.groovy‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,26 @@ import com.mongodb.WriteConcernResult
2121
import com.mongodb.async.FutureResultCallback
2222
import org.bson.Document
2323

24-
import static java.util.concurrent.TimeUnit.SECONDS
25-
2624
class ForEachSpecification extends FunctionalSpecification {
2725
def 'should complete with no results'() {
2826
expect:
2927
def futureResultCallback = new FutureResultCallback<Void>();
3028
collection.find(new Document()).forEach({ } as Block, futureResultCallback)
31-
futureResultCallback.get(60, SECONDS) == null
29+
futureResultCallback.get() == null
3230
}
3331

3432
def 'should apply block and complete'() {
3533
given:
3634
def document = new Document()
3735
def futureResultCallback = new FutureResultCallback<WriteConcernResult>();
3836
collection.insertOne(document, futureResultCallback)
39-
futureResultCallback.get(60, SECONDS)
37+
futureResultCallback.get()
4038

4139
when:
4240
def queriedDocuments = []
4341
futureResultCallback = new FutureResultCallback<Void>();
4442
collection.find(new Document()).forEach({ doc -> queriedDocuments += doc } as Block, futureResultCallback)
45-
futureResultCallback.get(60, SECONDS)
43+
futureResultCallback.get()
4644

4745
then:
4846
queriedDocuments == [document]
@@ -53,13 +51,13 @@ class ForEachSpecification extends FunctionalSpecification {
5351
def documents = [new Document(), new Document()]
5452
def futureResultCallback = new FutureResultCallback<WriteConcernResult>();
5553
collection.insertMany([documents[0], documents[1]], futureResultCallback)
56-
futureResultCallback.get(60, SECONDS)
54+
futureResultCallback.get()
5755

5856
when:
5957
def queriedDocuments = []
6058
futureResultCallback = new FutureResultCallback<Void>();
6159
collection.find(new Document()).forEach({ doc -> queriedDocuments += doc } as Block, futureResultCallback)
62-
futureResultCallback.get(60, SECONDS)
60+
futureResultCallback.get()
6361

6462
then:
6563
queriedDocuments == documents
@@ -70,12 +68,12 @@ class ForEachSpecification extends FunctionalSpecification {
7068
def document = new Document()
7169
def futureResultCallback = new FutureResultCallback<WriteConcernResult>();
7270
collection.insertOne(document, futureResultCallback)
73-
futureResultCallback.get(60, SECONDS)
71+
futureResultCallback.get()
7472

7573
when:
7674
futureResultCallback = new FutureResultCallback<Void>();
7775
collection.find(new Document()).forEach({ doc -> throw new IllegalArgumentException() } as Block, futureResultCallback)
78-
futureResultCallback.get(60, SECONDS)
76+
futureResultCallback.get()
7977

8078
then:
8179
thrown(IllegalArgumentException)

‎driver-core/src/test/functional/com/mongodb/internal/async/client/MapSpecification.groovy‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,14 @@ import com.mongodb.async.FutureResultCallback
2323
import org.bson.Document
2424
import org.bson.types.ObjectId
2525

26-
import static java.util.concurrent.TimeUnit.SECONDS
27-
2826
class MapSpecification extends FunctionalSpecification {
2927

3028
def documents = [new Document('_id', new ObjectId()).append('x', 42), new Document('_id', new ObjectId()).append('x', 43)]
3129

3230
def setup() {
3331
def futureResultCallback = new FutureResultCallback<WriteConcernResult>();
3432
collection.insertMany(documents, futureResultCallback)
35-
futureResultCallback.get(60, SECONDS)
33+
futureResultCallback.get()
3634
}
3735

3836
def 'should map source document into target document with into'() {
@@ -41,7 +39,7 @@ class MapSpecification extends FunctionalSpecification {
4139
collection.find(new Document())
4240
.map(new MappingFunction())
4341
.into([], futureResultCallback)
44-
futureResultCallback.get(60, SECONDS) == [new TargetDocument(documents[0]), new TargetDocument(documents[1])]
42+
futureResultCallback.get() == [new TargetDocument(documents[0]), new TargetDocument(documents[1])]
4543
}
4644

4745
def 'should map source document into target document with forEach'() {
@@ -51,7 +49,7 @@ class MapSpecification extends FunctionalSpecification {
5149
collection.find(new Document())
5250
.map(new MappingFunction())
5351
.forEach({ TargetDocument document -> targetDocuments += document } as Block<TargetDocument>, futureResultCallback)
54-
futureResultCallback.get(60, SECONDS)
52+
futureResultCallback.get()
5553
then:
5654
targetDocuments == [new TargetDocument(documents[0]), new TargetDocument(documents[1])]
5755
}
@@ -68,7 +66,7 @@ class MapSpecification extends FunctionalSpecification {
6866
targetDocument.getId()
6967
}
7068
}).forEach({ ObjectId id -> targetIdStrings += id.toString() } as Block<ObjectId>, futureResultCallback)
71-
futureResultCallback.get(60, SECONDS)
69+
futureResultCallback.get()
7270

7371
then:
7472
targetIdStrings == [new TargetDocument(documents[0]).getId().toString(), new TargetDocument(documents[1]).getId().toString()]

‎driver-core/src/test/functional/com/mongodb/internal/async/client/MongoClientListenerRegistrationSpecification.groovy‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ import com.mongodb.event.ServerListener
2424
import com.mongodb.event.ServerMonitorListener
2525
import org.bson.Document
2626

27-
import static java.util.concurrent.TimeUnit.SECONDS
28-
2927
class MongoClientListenerRegistrationSpecification extends FunctionalSpecification {
3028

3129
def 'should register event listeners'() {
@@ -80,7 +78,7 @@ class MongoClientListenerRegistrationSpecification extends FunctionalSpecificati
8078
def futureResultCallback = new FutureResultCallback()
8179
def opArgs = (args != null) ? args : []
8280
operation.call(*opArgs + futureResultCallback)
83-
futureResultCallback.get(60, SECONDS)
81+
futureResultCallback.get()
8482
}
8583

8684
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,6 @@ class MongoClientSessionSpecification extends FunctionalSpecification {
368368
FutureResultCallback futureResultCallback = new FutureResultCallback()
369369
List opArgs = (args != null) ? args : []
370370
Fixture.getMongoClient().&startSession.call(*opArgs + futureResultCallback)
371-
futureResultCallback.get(30, TimeUnit.SECONDS)
371+
futureResultCallback.get()
372372
}
373373
}

‎driver-core/src/test/functional/com/mongodb/internal/async/client/NettyStreamFactoryFactorySmokeTestSpecification.groovy‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import io.netty.channel.socket.oio.OioSocketChannel
2323
import org.bson.Document
2424

2525
import static Fixture.getMongoClientBuilderFromConnectionString
26-
import static java.util.concurrent.TimeUnit.SECONDS
2726

2827
class NettyStreamFactoryFactorySmokeTestSpecification extends FunctionalSpecification {
2928

@@ -57,6 +56,6 @@ class NettyStreamFactoryFactorySmokeTestSpecification extends FunctionalSpecific
5756
def futureResultCallback = new FutureResultCallback()
5857
def opArgs = (args != null) ? args : []
5958
operation.call(*opArgs + futureResultCallback)
60-
futureResultCallback.get(60, SECONDS)
59+
futureResultCallback.get()
6160
}
6261
}

‎driver-core/src/test/functional/com/mongodb/internal/operation/AsyncQueryBatchCursorFunctionalSpecification.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ class AsyncQueryBatchCursorFunctionalSpecification extends OperationFunctionalSp
367367
List<Document> nextBatch() {
368368
def futureResultCallback = new FutureResultCallback()
369369
cursor.next(futureResultCallback)
370-
futureResultCallback.get(60, SECONDS)
370+
futureResultCallback.get()
371371
}
372372

373373
private QueryResult<Document> executeQuery() {
@@ -403,14 +403,14 @@ class AsyncQueryBatchCursorFunctionalSpecification extends OperationFunctionalSp
403403
connection.commandAsync(getDatabaseName(), findCommand, NO_OP_FIELD_NAME_VALIDATOR, ReadPreference.primary(),
404404
CommandResultDocumentCodec.create(new DocumentCodec(), 'firstBatch'),
405405
connectionSource.sessionContext, futureResultCallback)
406-
def response = futureResultCallback.get(60, SECONDS)
406+
def response = futureResultCallback.get()
407407
cursorDocumentToQueryResult(response.getDocument('cursor'), connection.getDescription().getServerAddress())
408408
} else {
409409
def futureResultCallback = new FutureResultCallback<QueryResult<Document>>();
410410
connection.queryAsync(getNamespace(), filter, null, 0, limit, batchSize,
411411
true, tailable, awaitData, false, false, false,
412412
new DocumentCodec(), futureResultCallback);
413-
futureResultCallback.get(60, SECONDS);
413+
futureResultCallback.get();
414414
}
415415
}
416416

‎driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
262262
if (async) {
263263
def futureResultCallback = new FutureResultCallback()
264264
cursor.next(futureResultCallback)
265-
futureResultCallback.get(5, SECONDS)
265+
futureResultCallback.get()
266266
} else {
267267
cursor.next()
268268
}
@@ -271,7 +271,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
271271
if (async) {
272272
def futureResultCallback = new FutureResultCallback()
273273
cursor.next(futureResultCallback)
274-
futureResultCallback.get(5, SECONDS) != null
274+
futureResultCallback.get() != null
275275
} else {
276276
cursor.hasNext()
277277
}

‎driver-core/src/test/unit/com/mongodb/async/FutureResultCallback.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import java.util.concurrent.Future;
2525
import java.util.concurrent.TimeUnit;
2626

27+
import static com.mongodb.ClusterFixture.TIMEOUT;
28+
2729
/**
2830
* A SingleResultCallback Future implementation.
2931
*
@@ -59,7 +61,7 @@ public boolean isDone() {
5961

6062
@Override
6163
public T get() {
62-
return get(5, TimeUnit.MINUTES);
64+
return get(TIMEOUT, TimeUnit.SECONDS);
6365
}
6466

6567
@Override

‎driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerSpecification.groovy‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import static com.mongodb.MongoCredential.createCredential
5050
import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE
5151
import static com.mongodb.connection.ClusterConnectionMode.SINGLE
5252
import static com.mongodb.internal.event.EventListenerHelper.NO_OP_SERVER_LISTENER
53-
import static java.util.concurrent.TimeUnit.SECONDS
5453

5554
class DefaultServerSpecification extends Specification {
5655
private static final FieldNameValidator NO_OP_FIELD_NAME_VALIDATOR = new NoOpFieldNameValidator()
@@ -312,7 +311,7 @@ class DefaultServerSpecification extends Specification {
312311
def futureResultCallback = new FutureResultCallback()
313312
testConnection.insertAsync(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()),
314313
futureResultCallback);
315-
futureResultCallback.get(60, SECONDS)
314+
futureResultCallback.get()
316315

317316
then:
318317
thrown(MongoNotPrimaryException)
@@ -323,7 +322,7 @@ class DefaultServerSpecification extends Specification {
323322
futureResultCallback = new FutureResultCallback()
324323
testConnection.insertAsync(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()),
325324
futureResultCallback);
326-
futureResultCallback.get(60, SECONDS)
325+
futureResultCallback.get()
327326

328327
then:
329328
thrown(MongoNotPrimaryException)
@@ -389,7 +388,7 @@ class DefaultServerSpecification extends Specification {
389388
def futureResultCallback = new FutureResultCallback<WriteConcernResult>()
390389
testConnection.insertAsync(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()),
391390
futureResultCallback)
392-
futureResultCallback.get(60, SECONDS)
391+
futureResultCallback.get()
393392

394393
then:
395394
thrown(MongoSocketException)
@@ -428,7 +427,7 @@ class DefaultServerSpecification extends Specification {
428427
def futureResultCallback = new FutureResultCallback<WriteConcernResult>()
429428
testConnection.insertAsync(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()),
430429
futureResultCallback)
431-
futureResultCallback.get(60, SECONDS)
430+
futureResultCallback.get()
432431

433432
then:
434433
thrown(MongoSocketReadTimeoutException)

0 commit comments

Comments
 (0)