Fix invalid connection strings test

Author: viniciusam

src/main/java/io/github/utplsql/cli/ConnectionInfo.java

@@ -47,7 +47,7 @@ public ConnectionInfo parseConnectionString(String connectionString)
     private void parseCredentials(String str) throws ParameterException, IllegalArgumentException {
         int barIdx = str.indexOf("/");
 
-        if (barIdx == -1 || str.length() == 1)
+        if (barIdx == -1 || barIdx == 0 || barIdx == str.length() - 1)
             throw invalidConnectionString();
 
         this.setUser(str.substring(0, barIdx));
@@ -61,22 +61,21 @@ private void parseHost(String str) throws ParameterException, IllegalArgumentExc
         int colonIdx = str.indexOf(":");
         int barIdx = str.indexOf("/");
 
-        if (colonIdx != -1 && barIdx != -1) {
+        if ((colonIdx != -1 && barIdx == -1) || barIdx == 0) // @host:port or // @/db
+            throw invalidConnectionString();
+
+        if (colonIdx != -1) { // @host:port/db
             setHost(str.substring(0, colonIdx));
             setPort(Integer.parseInt(str.substring(colonIdx + 1, barIdx)));
             setDatabase(str.substring(barIdx + 1));
         }
         else
-        if (colonIdx == -1 && barIdx != -1) {
+        if (barIdx != -1) { // @host/db
             setHost(str.substring(0, barIdx));
             setPort(DEFAULT_PORT);
             setDatabase(str.substring(barIdx + 1));
         }
-        else
-        if (colonIdx != -1) {
-            throw invalidConnectionString();
-        }
-        else {
+        else { // @db
             setHost(DEFAULT_HOST);
             setPort(DEFAULT_PORT);
             setDatabase(str);

src/test/java/io/github/utplsql/cli/ConnectionInfoTest.java

@@ -17,7 +17,7 @@ public class ConnectionInfoTest {
      */
 
     @Test
-    public void connectionStr_Full() {
+    public void valid_Full() {
         try {
             ConnectionInfo ci = new ConnectionInfo()
                     .parseConnectionString("my_user/p@ss!@some.server.123-abc.com:3000/db_1.acme.com");
@@ -34,7 +34,7 @@ public void connectionStr_Full() {
     }
 
     @Test
-    public void connectionStr_WithoutPort() {
+    public void valid_WithoutPort() {
         try {
             ConnectionInfo ci = new ConnectionInfo()
                     .parseConnectionString("my_user/p@ss!@some.server.123-abc.com/db_1.acme.com");
@@ -51,7 +51,7 @@ public void connectionStr_WithoutPort() {
     }
 
     @Test
-    public void connectionStr_WithoutHostAndPort() {
+    public void valid_WithoutHostAndPort() {
         try {
             ConnectionInfo ci = new ConnectionInfo()
                     .parseConnectionString("my_user/p@ss!@127.0.0.1/db_1.acme.com");
@@ -68,14 +68,64 @@ public void connectionStr_WithoutHostAndPort() {
     }
 
     @Test
-    public void connectionStr_Invalid() {
+    public void invalid_WithoutDatabase_1() {
         try {
             new ConnectionInfo().parseConnectionString("user/pass@");
+            Assert.fail();
+        } catch (ParameterException ignored) {}
+    }
+
+    @Test
+    public void invalid_WithoutDatabase_2() {
+        try {
             new ConnectionInfo().parseConnectionString("user/pass");
-            new ConnectionInfo().parseConnectionString("user/@");
-            new ConnectionInfo().parseConnectionString("/pass@");
-            new ConnectionInfo().parseConnectionString("/@");
-            new ConnectionInfo().parseConnectionString("@");
+            Assert.fail();
+        } catch (ParameterException ignored) {}
+    }
+
+    @Test
+    public void invalid_WithoutDatabase_3() {
+        try {
+            new ConnectionInfo().parseConnectionString("user/pass@localhost:1521");
+            Assert.fail();
+        } catch (ParameterException ignored) {}
+    }
+
+    @Test
+    public void invalid_WithoutHost() {
+        try {
+            new ConnectionInfo().parseConnectionString("user/pass@/db");
+            Assert.fail();
+        } catch (ParameterException ignored) {}
+    }
+
+    @Test
+    public void invalid_WithoutPassword() {
+        try {
+            new ConnectionInfo().parseConnectionString("user/@db");
+            Assert.fail();
+        } catch (ParameterException ignored) {}
+    }
+
+    @Test
+    public void invalid_WithoutUsername() {
+        try {
+            new ConnectionInfo().parseConnectionString("/pass@db");
+            Assert.fail();
+        } catch (ParameterException ignored) {}
+    }
+
+    @Test
+    public void invalid_WithoutUserPassDb_1() {
+        try {
+            new ConnectionInfo().parseConnectionString("/@db");
+            Assert.fail();
+        } catch (ParameterException ignored) {}
+    }
+
+    @Test
+    public void invalid_WithoutUserPass() {
+        try {
             new ConnectionInfo().parseConnectionString("@db");
             Assert.fail();
         } catch (ParameterException ignored) {}