Refactor run methods into a more generic TestHelper class in the async driver

Author: jyemin

driver-async/src/test/functional/com/mongodb/async/client/SmokeTestSpecification.groovy

@@ -17,15 +17,14 @@
 package com.mongodb.async.client
 
 import com.mongodb.MongoNamespace
-import com.mongodb.async.FutureResultCallback
 import org.bson.Document
 import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.async.client.Fixture.getMongoClient
 import static com.mongodb.async.client.Fixture.isSharded
+import static com.mongodb.async.client.TestHelper.run
 import static java.util.Arrays.asList
-import static java.util.concurrent.TimeUnit.SECONDS
 
 class SmokeTestSpecification extends FunctionalSpecification {
 
@@ -179,12 +178,4 @@ class SmokeTestSpecification extends FunctionalSpecification {
         !run(database.listCollectionNames().&into, []).contains(collectionName)
         run(database.listCollectionNames().&into, []).contains(newCollectionName)
     }
-
-    def run(operation, ... args) {
-        def futureResultCallback = new FutureResultCallback()
-        def opArgs = (args != null) ? args : []
-        operation.call(*opArgs + futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-    }
-
 }

driver-async/src/test/functional/com/mongodb/async/client/TestHelper.groovy

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.mongodb.async.client
+
+import com.mongodb.async.FutureResultCallback
+
+import java.util.concurrent.TimeUnit
+
+class TestHelper {
+    static run(operation, ... args) {
+        runOp(operation, 60, *args)
+    }
+
+    static runSlow(operation, ... args) {
+        runOp(operation, 180, *args)
+    }
+
+    static runOp(operation, timeout, ... args) {
+        FutureResultCallback futureResultCallback = new FutureResultCallback()
+        List opArgs = (args != null) ? args : []
+        operation.call(*opArgs + futureResultCallback)
+        futureResultCallback.get(timeout, TimeUnit.SECONDS)
+    }
+}

driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSBucketSmokeTestSpecification.groovy

@@ -37,10 +37,10 @@ import java.nio.ByteBuffer
 import java.security.MessageDigest
 import java.security.SecureRandom
 
-import static GridFSTestHelper.run
 import static com.mongodb.async.client.Fixture.getDefaultDatabaseName
 import static com.mongodb.async.client.Fixture.getMongoClient
-import static com.mongodb.async.client.gridfs.GridFSTestHelper.runSlow
+import static com.mongodb.async.client.TestHelper.run
+import static com.mongodb.async.client.TestHelper.runSlow
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncInputStream
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncOutputStream
 import static com.mongodb.client.model.Filters.eq

driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSTestHelper.groovy

@@ -29,7 +29,7 @@ import java.nio.ByteBuffer
 
 import static com.mongodb.async.client.Fixture.getDefaultDatabaseName
 import static com.mongodb.async.client.Fixture.getMongoClient
-import static com.mongodb.async.client.gridfs.GridFSTestHelper.run
+import static com.mongodb.async.client.TestHelper.run
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncInputStream
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncOutputStream
 

driver-async/src/test/functional/com/mongodb/async/client/gridfs/helpers/AsyncStreamHelperTestSpecification.groovy

@@ -21,19 +21,27 @@ import com.mongodb.async.client.MongoCollection
 import com.mongodb.async.client.MongoDatabase
 import com.mongodb.async.client.gridfs.GridFSBucket
 import com.mongodb.async.client.gridfs.GridFSBucketImpl
-import com.mongodb.async.client.gridfs.GridFSTestHelper
 import org.bson.Document
 import spock.lang.Requires
 
 import java.nio.ByteBuffer
-import java.nio.channels.*  // Wildcard import to work around Java 1.6
-import java.nio.file.*      // Wildcard import to work around Java 1.6
+import java.nio.channels.AsynchronousByteChannel
+import java.nio.channels.AsynchronousFileChannel
+import java.nio.channels.CompletionHandler
+import java.nio.file.Files
+
+// Wildcard import to work around Java 1.6
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.nio.file.StandardOpenOption
+import java.util.concurrent.Future
 
-import static GridFSTestHelper.TestAsynchronousByteChannel
-import static GridFSTestHelper.run
 import static com.mongodb.async.client.Fixture.getDefaultDatabaseName
 import static com.mongodb.async.client.Fixture.getMongoClient
+import static com.mongodb.async.client.TestHelper.run
 import static com.mongodb.async.client.gridfs.helpers.AsynchronousChannelHelper.channelToInputStream
+
+// Wildcard import to work around Java 1.6
 import static com.mongodb.async.client.gridfs.helpers.AsynchronousChannelHelper.channelToOutputStream
 
 @Requires({ javaVersion >= 1.7 })
@@ -47,7 +55,7 @@ class AsynchronousChannelHelperSmokeTestSpecification extends FunctionalSpecific
         mongoDatabase = getMongoClient().getDatabase(getDefaultDatabaseName())
         filesCollection = mongoDatabase.getCollection('fs.files')
         chunksCollection = mongoDatabase.getCollection('fs.chunks')
-        GridFSTestHelper.run(filesCollection.&drop)
+        run(filesCollection.&drop)
         run(chunksCollection.&drop)
         gridFSBucket = new GridFSBucketImpl(mongoDatabase)
     }
@@ -109,4 +117,70 @@ class AsynchronousChannelHelperSmokeTestSpecification extends FunctionalSpecific
         content == asyncByteChannel.getWriteBuffer()
     }
 
+    static class TestAsynchronousByteChannel implements AsynchronousByteChannel, Closeable {
+        private boolean closed
+        private final readBuffer
+        private final writeBuffer = ByteBuffer.allocate(1024)
+
+        TestAsynchronousByteChannel(final readBuffer) {
+            this.readBuffer = readBuffer
+        }
+
+        ByteBuffer getReadBuffer() {
+            readBuffer.flip()
+        }
+
+        ByteBuffer getWriteBuffer() {
+            writeBuffer.flip()
+        }
+
+        @Override
+        <A> void read(final ByteBuffer dst, final A attachment, final CompletionHandler<Integer, ? super A> handler) {
+            int transferAmount = Math.min(dst.remaining(), readBuffer.remaining());
+            if (transferAmount == 0) {
+                transferAmount = -1
+            }
+            if (transferAmount > 0) {
+                ByteBuffer temp = readBuffer.duplicate()
+                temp.limit(temp.position() + transferAmount)
+                dst.put(temp)
+                readBuffer.position(readBuffer.position() + transferAmount)
+            }
+            handler.completed(transferAmount, attachment)
+        }
+
+        @Override
+        Future<Integer> read(final ByteBuffer dst) {
+            throw new UnsupportedOperationException('Not Supported')
+        }
+
+        @Override
+        <A> void write(final ByteBuffer src, final A attachment, final CompletionHandler<Integer, ? super A> handler) {
+            int transferAmount = Math.min(src.remaining(), writeBuffer.remaining());
+            if (transferAmount == 0) {
+                transferAmount = -1
+            }
+            if (transferAmount > 0) {
+                ByteBuffer temp = src.duplicate()
+                temp.limit(temp.position() + transferAmount)
+                writeBuffer.put(temp)
+            }
+            handler.completed(transferAmount, attachment)
+        }
+
+        @Override
+        Future<Integer> write(final ByteBuffer src) {
+            throw new UnsupportedOperationException('Not Supported')
+        }
+
+        @Override
+        void close() throws IOException {
+            closed = true
+        }
+
+        @Override
+        boolean isOpen() {
+            !closed;
+        }
+    }
 }