Skip to content

Commit 46b038c

Browse files
DATAMONGO-2331 - Guard test execution.
1 parent 07b52d0 commit 46b038c

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUpdateTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.List;
2424

2525
import org.junit.Before;
26+
import org.junit.ClassRule;
2627
import org.junit.Ignore;
2728
import org.junit.Test;
2829
import org.springframework.data.annotation.Id;
@@ -36,6 +37,7 @@
3637
import org.springframework.data.mongodb.core.query.Criteria;
3738
import org.springframework.data.mongodb.core.query.Query;
3839
import org.springframework.data.mongodb.test.util.MongoTestUtils;
40+
import org.springframework.data.mongodb.test.util.MongoVersionRule;
3941

4042
import com.mongodb.MongoClient;
4143
import com.mongodb.client.MongoCollection;
@@ -45,6 +47,8 @@
4547
*/
4648
public class MongoTemplateUpdateTests {
4749

50+
public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_4_2 = MongoVersionRule.REQUIRES_4_2;
51+
4852
static final String DB_NAME = "update-test";
4953

5054
MongoClient client;

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUpdateTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.List;
2727

2828
import org.junit.Before;
29+
import org.junit.ClassRule;
2930
import org.junit.Ignore;
3031
import org.junit.Test;
3132
import org.springframework.data.annotation.Id;
@@ -39,6 +40,7 @@
3940
import org.springframework.data.mongodb.core.query.Criteria;
4041
import org.springframework.data.mongodb.core.query.Query;
4142
import org.springframework.data.mongodb.test.util.MongoTestUtils;
43+
import org.springframework.data.mongodb.test.util.MongoVersionRule;
4244

4345
import com.mongodb.reactivestreams.client.MongoClient;
4446
import com.mongodb.reactivestreams.client.MongoCollection;
@@ -48,6 +50,8 @@
4850
*/
4951
public class ReactiveMongoTemplateUpdateTests {
5052

53+
public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_4_2 = MongoVersionRule.REQUIRES_4_2;
54+
5155
static final String DB_NAME = "reactive-update-test";
5256

5357
MongoClient client;

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoVersionRule.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ public class MongoVersionRule implements TestRule {
4545
private static final Version DEFAULT_HIGH = ANY;
4646
private static final Version DEFAULT_LOW = new Version(0, 0, 0);
4747

48+
public static MongoVersionRule REQUIRES_4_2 = MongoVersionRule
49+
.atLeast(org.springframework.data.util.Version.parse("4.2"));
50+
4851
private final AtomicReference<Version> currentVersion = new AtomicReference<>(null);
4952
private final Version minVersion;
5053
private final Version maxVersion;
@@ -128,7 +131,6 @@ public void evaluate() throws Throwable {
128131
Version maxVersion = MongoVersionRule.this.maxVersion.equals(ANY) ? DEFAULT_HIGH
129132
: MongoVersionRule.this.maxVersion;
130133

131-
132134
if (description.getAnnotation(MongoVersion.class) != null) {
133135
MongoVersion version = description.getAnnotation(MongoVersion.class);
134136
if (version != null) {

0 commit comments

Comments
 (0)