remove the tests for AMQP URIs which are not actually URIs

Author: Alexandru Scvortov

src/com/rabbitmq/client/ConnectionFactory.java

@@ -187,7 +187,10 @@ public void setVirtualHost(String virtualHost) {
      * Convenience method for setting the fields in an AMQP URI: host,
      * port, username, password and virtual host.  If any part of the
      * URI is ommited, the ConnectionFactory's corresponding variable
-     * is left unchanged.  Escapes in the hostname are not permitted.
+     * is left unchanged.  Note that not all valid AMQP URIs are
+     * accepted; in particular, the hostname must be given if the
+     * port, username or password are given, and escapes in the
+     * hostname are not permitted.
      * @param uriString is the AMQP URI containing the data
      */
     public void setUri(String uriString)

test/src/com/rabbitmq/client/test/AmqpUriTest.java

@@ -23,60 +23,43 @@
 public class AmqpUriTest extends BrokerTestCase
 {
     public void testUriParsing() throws URISyntaxException {
-        /* From the spec */
+        /* From the spec (subset of the tests) */
         parseSuccess("amqp://user:pass@host:10000/vhost",
                      "user", "pass", "host", 10000, "vhost");
         parseSuccess("amqp://user%61:%61pass@host:10000/v%2fhost",
                      "usera", "apass", "host", 10000, "v/host");
-        parseSuccess("amqp://", "guest", "guest", "localhost", 5672, "/");
-        parseSuccess("amqp://:@/", "", "", "localhost", 5672, "");
-        parseSuccess("amqp://user@", "user", "guest", "localhost", 5672, "/");
-        parseSuccess("amqp://user:pass@",
-                     "user", "pass", "localhost", 5672, "/");
         parseSuccess("amqp://host", "guest", "guest", "host", 5672, "/");
-        parseSuccess("amqp://:10000",
-                     "guest", "guest", "localhost", 10000, "/");
         parseSuccess("amqp:///vhost",
                      "guest", "guest", "localhost", 5672, "vhost");
         parseSuccess("amqp://host/", "guest", "guest", "host", 5672, "");
         parseSuccess("amqp://host/%2f", "guest", "guest", "host", 5672, "/");
-        parseSuccess("amqp://[::1]", "guest", "guest", "::1", 5672, "/");
+        parseSuccess("amqp://[::1]", "guest", "guest", "[::1]", 5672, "/");
 
         /* Various other success cases */
         parseSuccess("amqp://host:100", "guest", "guest", "host", 100, "/");
-        parseSuccess("amqp://[::1]:100", "guest", "guest", "::1", 100, "/");
+        parseSuccess("amqp://[::1]:100", "guest", "guest", "[::1]", 100, "/");
 
         parseSuccess("amqp://host/blah",
                      "guest", "guest", "host", 5672, "blah");
         parseSuccess("amqp://host:100/blah",
                      "guest", "guest", "host", 100, "blah");
-        parseSuccess("amqp://:100/blah", "guest", "guest",
-                     "localhost", 100, "blah");
         parseSuccess("amqp://[::1]/blah",
-                     "guest", "guest", "::1", 5672, "blah");
+                     "guest", "guest", "[::1]", 5672, "blah");
         parseSuccess("amqp://[::1]:100/blah",
-                     "guest", "guest", "::1", 100, "blah");
+                     "guest", "guest", "[::1]", 100, "blah");
 
         parseSuccess("amqp://user:pass@host",
                      "user", "pass", "host", 5672, "/");
-        parseSuccess("amqp://user:pass@host:100",
-                     "user", "pass", "host", 100, "/");
-        parseSuccess("amqp://user:pass@:100",
-                     "user", "pass", "localhost", 100, "/");
         parseSuccess("amqp://user:pass@[::1]",
-                     "user", "pass", "::1", 5672, "/");
+                     "user", "pass", "[::1]", 5672, "/");
         parseSuccess("amqp://user:pass@[::1]:100",
-                     "user", "pass", "::1", 100, "/");
+                     "user", "pass", "[::1]", 100, "/");
 
         /* Various failure cases */
         parseFail("http://www.rabbitmq.com");
-        parseFail("amqp://foo:bar:baz");
         parseFail("amqp://foo[::1]");
         parseFail("amqp://foo:[::1]");
         parseFail("amqp://[::1]foo");
-        parseFail("amqp://foo:1000xyz");
-        parseFail("amqp://foo:1000000");
-        parseFail("amqp://foo/bar/baz");
 
         parseFail("amqp://foo%1");
         parseFail("amqp://foo%1x");