Fix embedded transaction tests

Author: rozza

driver-core/src/test/functional/com/mongodb/JsonTestServerVersionChecker.java

@@ -22,6 +22,7 @@
 
 import java.util.List;
 
+import static com.mongodb.ClusterFixture.getServerVersion;
 import static com.mongodb.ClusterFixture.getVersionList;
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
 import static com.mongodb.ClusterFixture.isSharded;
@@ -31,15 +32,16 @@
 
 public final class JsonTestServerVersionChecker {
     private static final List<String> TOPOLOGY_TYPES = asList("sharded", "replicaset", "single");
-    private static ServerVersion serverVersion;
 
     public static boolean skipTest(final BsonDocument testDocument, final BsonDocument testDefinition) {
-        return !(canRunTest(testDocument) && canRunTest(testDefinition));
+        return skipTest(testDocument, testDefinition, getServerVersion());
     }
 
-    private static boolean canRunTest(final BsonDocument document) {
-        ServerVersion serverVersion = getServerVersion();
+    public static boolean skipTest(final BsonDocument testDocument, final BsonDocument testDefinition, final ServerVersion serverVersion) {
+        return !(canRunTest(testDocument, serverVersion) && canRunTest(testDefinition, serverVersion));
+    }
 
+    private static boolean canRunTest(final BsonDocument document, final ServerVersion serverVersion) {
         if (document.containsKey("minServerVersion")
                 && serverVersion.compareTo(getServerVersionForField("minServerVersion", document)) < 0) {
             return false;
@@ -54,7 +56,7 @@ private static boolean canRunTest(final BsonDocument document) {
         }
 
         if (document.containsKey("runOn")) {
-            return canRunTest(document.getArray("runOn"));
+            return canRunTest(document.getArray("runOn"), serverVersion);
         }
 
         // Ignore certain matching types
@@ -73,10 +75,10 @@ private static boolean canRunTest(final BsonDocument document) {
         return true;
     }
 
-    private static boolean canRunTest(final BsonArray runOn) {
+    private static boolean canRunTest(final BsonArray runOn, final ServerVersion serverVersion) {
         boolean topologyFound = false;
         for (BsonValue info : runOn) {
-            topologyFound = canRunTest(info.asDocument());
+            topologyFound = canRunTest(info.asDocument(), serverVersion);
             if (topologyFound) {
                 break;
             }
@@ -100,13 +102,6 @@ private static boolean topologyMatches(final BsonArray topologyTypes) {
         return false;
     }
 
-    private static ServerVersion getServerVersion() {
-        if (serverVersion == null) {
-            serverVersion = ClusterFixture.getServerVersion();
-        }
-        return serverVersion;
-    }
-
     private static ServerVersion getServerVersionForField(final String fieldName, final BsonDocument document) {
         return new ServerVersion(getVersionList(document.getString(fieldName).getValue()));
     }

driver-embedded-android/src/androidTest/java/com/mongodb/embedded/client/CrudTest.java

@@ -18,6 +18,7 @@
 
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
+
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
@@ -33,6 +34,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import static com.mongodb.embedded.client.Fixture.serverVersionGreaterThan;
+import static com.mongodb.embedded.client.Fixture.serverVersionLessThan;
 import static org.junit.Assert.assertEquals;
 
 // See https://github.com/mongodb/specifications/tree/master/source/crud/tests
@@ -45,11 +48,10 @@ public class CrudTest {
     private MongoCollection<BsonDocument> collection;
     private JsonPoweredCrudTestHelper helper;
 
-    public CrudTest(final String description, final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+    public CrudTest(final String description, final BsonArray data, final BsonDocument definition) {
         this.description = description;
         this.data = data;
         this.definition = definition;
-        this.skipTest = skipTest;
     }
 
     @Before
@@ -113,7 +115,12 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
         }
 
         for (BsonDocument testDocument : JsonPoweredCrudTestHelper.getTestDocuments("crud")) {
-            if (!canRunTests(testDocument)) {
+            if (testDocument.containsKey("minServerVersion")
+                    && serverVersionLessThan(testDocument.getString("minServerVersion").getValue())) {
+                continue;
+            }
+            if (testDocument.containsKey("maxServerVersion")
+                    && serverVersionGreaterThan(testDocument.getString("maxServerVersion").getValue())) {
                 continue;
             }
             for (BsonValue test: testDocument.getArray("tests")) {

driver-embedded/src/test/functional/com/mongodb/embedded/client/CrudTest.java

@@ -40,6 +40,7 @@
 import static com.mongodb.JsonTestServerVersionChecker.skipTest;
 import static com.mongodb.client.Fixture.getDefaultDatabaseName;
 import static com.mongodb.embedded.client.Fixture.getMongoClient;
+import static com.mongodb.embedded.client.Fixture.getServerVersion;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeFalse;
 
@@ -132,7 +133,7 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
             for (BsonValue test: testDocument.getArray("tests")) {
                 data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
                         testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
-                        testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
+                        testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument(), getServerVersion())});
             }
         }
         return data;

driver-embedded/src/test/functional/com/mongodb/embedded/client/Fixture.java

@@ -83,15 +83,7 @@ static String getDefaultDatabaseName() {
         return DEFAULT_DATABASE_NAME;
     }
 
-    static boolean serverVersionLessThan(final String versionString) {
-        return getServerVersion().compareTo(new ServerVersion(getVersionList(versionString).subList(0, 3))) < 0;
-    }
-
-    static boolean serverVersionGreaterThan(final String versionString) {
-        return getServerVersion().compareTo(new ServerVersion(getVersionList(versionString).subList(0, 3))) > 0;
-    }
-
-    private static synchronized ServerVersion getServerVersion() {
+    static synchronized ServerVersion getServerVersion() {
         if (serverVersion == null) {
             BsonDocument buildInfoResult = getMongoClient().getDatabase("admin")
                     .runCommand(new Document("buildInfo", 1), BsonDocument.class);