mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATAMONGO-2331 - Guard test execution.

Browse Source 
Original pull request: #789.
This commit is contained in:
Christoph Strobl
2019-09-17 13:42:55 +02:00
committed by Mark Paluch
parent 32cbae0e5f
commit cc07a1bbb4
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.List;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.data.annotation.Id;
@@ -36,6 +37,7 @@ import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.data.mongodb.test.util.MongoVersionRule;
import com.mongodb.MongoClient;
import com.mongodb.client.MongoCollection;
@@ -45,6 +47,8 @@ import com.mongodb.client.MongoCollection;
*/
public class MongoTemplateUpdateTests {
public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_4_2 = MongoVersionRule.REQUIRES_4_2;
static final String DB_NAME = "update-test";
MongoClient client;

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

@@ -26,6 +26,7 @@ import java.util.Collection;
import java.util.List;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.data.annotation.Id;
@@ -39,6 +40,7 @@ import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.data.mongodb.test.util.MongoVersionRule;
import com.mongodb.reactivestreams.client.MongoClient;
import com.mongodb.reactivestreams.client.MongoCollection;
@@ -48,6 +50,8 @@ import com.mongodb.reactivestreams.client.MongoCollection;
*/
public class ReactiveMongoTemplateUpdateTests {
public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_4_2 = MongoVersionRule.REQUIRES_4_2;
static final String DB_NAME = "reactive-update-test";
MongoClient client;

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

@@ -45,6 +45,9 @@ public class MongoVersionRule implements TestRule {
private static final Version DEFAULT_HIGH = ANY;
private static final Version DEFAULT_LOW = new Version(0, 0, 0);
public static MongoVersionRule REQUIRES_4_2 = MongoVersionRule
.atLeast(org.springframework.data.util.Version.parse("4.2"));
private final AtomicReference<Version> currentVersion = new AtomicReference<>(null);
private final Version minVersion;
private final Version maxVersion;