Add ConnectionStringTest subclass of AbstractConnectionStringTest

JAVA-3066

Author: jyemin

driver-core/src/test/unit/com/mongodb/AbstractConnectionStringTest.java

@@ -34,9 +34,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-// See https://github.com/mongodb/specifications/tree/master/source/connection-string/tests
 @RunWith(Parameterized.class)
-public class AbstractConnectionStringTest extends TestCase {
+public abstract class AbstractConnectionStringTest extends TestCase {
     private final String filename;
     private final String description;
     private final String input;
@@ -50,47 +49,15 @@ public AbstractConnectionStringTest(final String filename, final String descript
         this.definition = definition;
     }
 
-    @Test
-    public void shouldPassAllOutcomes() {
-        if (filename.equals("invalid-uris.json")) {
-            testInvalidUris();
-        } else if (filename.equals("valid-auth.json")) {
-            testValidAuth();
-        } else if (filename.equals("valid-db-with-dotted-name.json")) {
-            testValidHostIdentifiers();
-            testValidAuth();
-        } else if (filename.equals("valid-host_identifiers.json")) {
-            testValidHostIdentifiers();
-        } else if (filename.equals("valid-options.json")) {
-            testValidOptions();
-        } else if (filename.equals("valid-unix_socket-absolute.json")) {
-            testValidHostIdentifiers();
-        } else if (filename.equals("valid-unix_socket-relative.json")) {
-            testValidHostIdentifiers();
-        } else if (filename.equals("valid-warnings.json")) {
-            testValidHostIdentifiers();
-            if (!definition.get("options").isNull()) {
-                testValidOptions();
-            }
-        } else {
-            throw new IllegalArgumentException("Unsupported file: " + filename);
-        }
+    protected String getFilename() {
+        return filename;
     }
 
-    @Parameterized.Parameters(name = "{1}")
-    public static Collection<Object[]> data() throws URISyntaxException, IOException {
-        List<Object[]> data = new ArrayList<Object[]>();
-        for (File file : JsonPoweredTestHelper.getTestFiles("/connection-string")) {
-            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
-            for (BsonValue test : testDocument.getArray("tests")) {
-                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
-                        test.asDocument().getString("uri").getValue(), test.asDocument()});
-            }
-        }
-        return data;
+    protected BsonDocument getDefinition() {
+        return definition;
     }
 
-    private void testInvalidUris() {
+    protected void testInvalidUris() {
         Throwable expectedError = null;
 
         try {
@@ -103,7 +70,7 @@ private void testInvalidUris() {
                 expectedError instanceof IllegalArgumentException);
     }
 
-    private void testValidHostIdentifiers() {
+    protected void testValidHostIdentifiers() {
         ConnectionString connectionString = null;
         try {
             connectionString = new ConnectionString(input);
@@ -114,7 +81,7 @@ private void testValidHostIdentifiers() {
         assertExpectedHosts(connectionString.getHosts());
     }
 
-    private void testValidOptions() {
+    protected void testValidOptions() {
         ConnectionString connectionString = null;
 
         try {
@@ -140,7 +107,7 @@ private void testValidOptions() {
         }
     }
 
-    private void testValidAuth() {
+    protected void testValidAuth() {
         ConnectionString connectionString = null;
 
         try {

driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2008-present 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;
+
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.Test;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+// See https://github.com/mongodb/specifications/tree/master/source/connection-string/tests
+public class ConnectionStringTest extends AbstractConnectionStringTest {
+    public ConnectionStringTest(final String filename, final String description, final String input, final BsonDocument definition) {
+        super(filename, description, input, definition);
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        if (getFilename().equals("invalid-uris.json")) {
+            testInvalidUris();
+        } else if (getFilename().equals("valid-auth.json")) {
+            testValidAuth();
+        } else if (getFilename().equals("valid-db-with-dotted-name.json")) {
+            testValidHostIdentifiers();
+            testValidAuth();
+        } else if (getFilename().equals("valid-host_identifiers.json")) {
+            testValidHostIdentifiers();
+        } else if (getFilename().equals("valid-options.json")) {
+            testValidOptions();
+        } else if (getFilename().equals("valid-unix_socket-absolute.json")) {
+            testValidHostIdentifiers();
+        } else if (getFilename().equals("valid-unix_socket-relative.json")) {
+            testValidHostIdentifiers();
+        } else if (getFilename().equals("valid-warnings.json")) {
+            testValidHostIdentifiers();
+            if (!getDefinition().get("options").isNull()) {
+                testValidOptions();
+            }
+        } else {
+            throw new IllegalArgumentException("Unsupported file: " + getFilename());
+        }
+    }
+
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/connection-string")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        test.asDocument().getString("uri").getValue(), test.asDocument()});
+            }
+        }
+        return data;
+    }
+}