Skip to content

Commit 0fa569b

Browse files
jyeminrozza
authored andcommitted
Fixed functional test specifications for Filters, Projections, and Sorts to make sure they pass will all supported MongoDB configurations
1 parent bb73a97 commit 0fa569b

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

driver-core/src/test/functional/com/mongodb/client/model/FiltersFunctionalSpecification.groovy

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ import com.mongodb.OperationFunctionalSpecification
2020
import org.bson.BsonType
2121
import org.bson.Document
2222
import org.bson.conversions.Bson
23+
import spock.lang.IgnoreIf
2324

2425
import java.util.regex.Pattern
2526

27+
import static com.mongodb.ClusterFixture.serverVersionAtLeast
2628
import static com.mongodb.client.model.Filters.all
2729
import static com.mongodb.client.model.Filters.and
2830
import static com.mongodb.client.model.Filters.elemMatch
@@ -78,6 +80,7 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
7880
find(ne('x', 1)) == [b, c]
7981
}
8082

83+
@IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
8184
def '$not'() {
8285
expect:
8386
find(not(eq('x', 1))) == [b, c]
@@ -190,6 +193,7 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
190193
find(type('x', BsonType.ARRAY)) == []
191194
}
192195

196+
@IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
193197
def 'should render $text'() {
194198
expect:
195199
find(text('I love MongoDB')) == []

driver-core/src/test/functional/com/mongodb/client/model/ProjectionFunctionalSpecification.groovy

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ import com.mongodb.MongoQueryException
2020
import com.mongodb.OperationFunctionalSpecification
2121
import org.bson.Document
2222
import org.bson.conversions.Bson
23+
import spock.lang.IgnoreIf
2324

25+
import static com.mongodb.ClusterFixture.serverVersionAtLeast
2426
import static com.mongodb.client.model.Filters.and
2527
import static com.mongodb.client.model.Filters.eq
2628
import static com.mongodb.client.model.Projections.elemMatch
@@ -54,11 +56,11 @@ class ProjectionFunctionalSpecification extends OperationFunctionalSpecification
5456
}
5557

5658
def 'find'(Bson projection) {
57-
getCollectionHelper().find(new Document(), new Document('_id', 1), projection)
59+
getCollectionHelper().find(null, null, projection)
5860
}
5961

6062
def 'find'(Bson filter, Bson projection) {
61-
getCollectionHelper().find(filter, new Document('_id', 1), projection)
63+
getCollectionHelper().find(filter, null, projection)
6264
}
6365

6466
def 'include'() {
@@ -97,6 +99,7 @@ class ProjectionFunctionalSpecification extends OperationFunctionalSpecification
9799
find(slice('y', 1, 2)) == [aYSlice12]
98100
}
99101

102+
@IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
100103
def 'metaTextScore'() {
101104
expect:
102105
find(metaTextScore('score')) == [aWithScore]

driver-core/src/test/functional/com/mongodb/client/model/SortsFunctionalSpecification.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ package com.mongodb.client.model
1919
import com.mongodb.OperationFunctionalSpecification
2020
import org.bson.Document
2121
import org.bson.conversions.Bson
22+
import spock.lang.IgnoreIf
2223

24+
import static com.mongodb.ClusterFixture.serverVersionAtLeast
2325
import static com.mongodb.client.model.Sorts.ascending
2426
import static com.mongodb.client.model.Sorts.descending
2527
import static com.mongodb.client.model.Sorts.metaTextScore
@@ -62,6 +64,7 @@ class SortsFunctionalSpecification extends OperationFunctionalSpecification {
6264
find(descending('x', 'y')) == [c, a, b]
6365
}
6466

67+
@IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
6568
def 'metaTextScore'() {
6669
expect:
6770
find(metaTextScore('score'), new Document('score', new Document('$meta', 'textScore')))*.containsKey('score')

0 commit comments

Comments
 (0)