Working around the removal of the isSharded check in JsonPoweredCrudTestHelper

Author: jyemin

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

@@ -35,6 +35,7 @@
 import java.util.List;
 
 import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
+import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.JsonTestServerVersionChecker.skipTest;
 import static com.mongodb.async.client.Fixture.getDefaultDatabase;
 import static com.mongodb.async.client.Fixture.getMongoClient;
@@ -68,6 +69,8 @@ public CrudTest(final String filename, final String description, final String da
     public void setUp() {
         super.setUp();
         assumeFalse(skipTest);
+        // No runOn syntax for legacy CRUD, so skipping these manually for now
+        assumeFalse(isSharded() && description.startsWith("Aggregate with $currentOp"));
         collection = Fixture.initializeCollection(new MongoNamespace(databaseName, getClass().getName()))
                 .withDocumentClass(BsonDocument.class);
         helper = new JsonPoweredCrudTestHelper(description, getMongoClient().getDatabase(databaseName), collection);

driver-async/src/test/functional/com/mongodb/async/client/JsonPoweredCrudTestHelper.java

@@ -84,11 +84,9 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.mongodb.async.client.Fixture.isSharded;
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncInputStream;
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncOutputStream;
 import static java.lang.String.format;
-import static org.junit.Assume.assumeTrue;
 
 public class JsonPoweredCrudTestHelper {
     private final String description;
@@ -305,7 +303,6 @@ BsonDocument getAggregateResult(final BsonDocument collectionOptions, final Bson
 
     BsonDocument getDatabaseAggregateResult(final BsonDocument collectionOptions, final BsonDocument arguments,
                                             @Nullable final ClientSession clientSession) {
-        assumeTrue(!isSharded());
         List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
         for (BsonValue stage : arguments.getArray("pipeline")) {
             pipeline.add(stage.asDocument());

driver-legacy/src/test/functional/com/mongodb/client/LegacyCrudTest.java

@@ -33,6 +33,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.JsonTestServerVersionChecker.skipTest;
 import static com.mongodb.client.Fixture.getDefaultDatabaseName;
 import static org.junit.Assert.assertEquals;
@@ -64,6 +65,8 @@ public LegacyCrudTest(final String filename, final String description, final Str
     public void setUp() {
         super.setUp();
         assumeFalse(skipTest);
+        // No runOn syntax for legacy CRUD, so skipping these manually for now
+        assumeFalse(isSharded() && description.startsWith("Aggregate with $currentOp"));
         if (!data.isEmpty()) {
             List<BsonDocument> documents = new ArrayList<BsonDocument>();
             for (BsonValue document : data) {

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

@@ -34,6 +34,7 @@
 import java.util.List;
 
 import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
+import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.JsonTestServerVersionChecker.skipTest;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeFalse;
@@ -64,6 +65,8 @@ public CrudTest(final String filename, final String description, final String da
     public void setUp() {
         super.setUp();
         assumeFalse(skipTest);
+        // No runOn syntax for legacy CRUD, so skipping these manually for now
+        assumeFalse(isSharded() && description.startsWith("Aggregate with $currentOp"));
         List<BsonDocument> documents = new ArrayList<BsonDocument>();
         if (!data.isEmpty()) {
             for (BsonValue document : data) {