refactor tests and extend dcos

Alexandru Scvortov · Alexandru Scvortov · commit 471414de7086 · 2011-10-18T11:46:33.000+01:00
diff --git a/projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs b/projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs
@@ -91,10 +91,10 @@ namespace RabbitMQ.Client
     ///<para>
     ///Note that the Uri property takes a string representation of an
     ///AMQP URI.  Omitted URI parts will take default values.  The
-    ///only deviations from the spec are that URIs of the form
+    ///host part of the URI cannot be omitted and URIs of the form
     ///"amqp://foo/" (note the trailling slash) also represent the
-    ///default virtual host and that the hostname must be specified.
-    ///</para></remarks>
+    ///default virtual host.  The latter issue means that virtual
+    ///hosts with an empty name are not addressable. </para></remarks>
     public class ConnectionFactory
     {
         /// <summary>Default user name (value: "guest")</summary>
diff --git a/projects/client/Unit/src/unit/TestAmqpUri.cs b/projects/client/Unit/src/unit/TestAmqpUri.cs
@@ -140,13 +140,12 @@ private void ParseSuccess(string uri, string user, string password,
 
         private void ParseFail(string uri)
         {
-            try {
-                ConnectionFactory cf = new ConnectionFactory();
-                cf.Uri = uri;
-                Assert.Fail("URI parse didn't fail: '" + uri + "'");
-            } catch (Exception) {
-                // whoosh!
-            }
+            Assert.Throws(
+              Is.InstanceOf<Exception>(),
+              delegate {
+                  ConnectionFactory cf = new ConnectionFactory();
+                  cf.Uri = uri;
+              });
         }
     }
 }
diff --git a/projects/examples/client/AddClient/src/examples/AddClient.cs b/projects/examples/client/AddClient/src/examples/AddClient.cs
@@ -52,6 +52,8 @@ public static int Main(string[] args) {
             if (args.Length < 1) {
                 Console.Error.WriteLine("Usage: AddClient <uri> [<number> ...]");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                 return 2;
             }
 
diff --git a/projects/examples/client/AddServer/src/examples/AddServer.cs b/projects/examples/client/AddServer/src/examples/AddServer.cs
@@ -53,6 +53,8 @@ public static int Main(string[] args) {
             if (args.Length < 1) {
                 Console.Error.WriteLine("Usage: AddServer <uri>");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                 return 2;
             }
 
diff --git a/projects/examples/client/DeclareQueue/src/examples/DeclareQueue.cs b/projects/examples/client/DeclareQueue/src/examples/DeclareQueue.cs
@@ -74,6 +74,8 @@ public static int Main(string[] args) {
                 {
                     Console.Error.WriteLine("Usage: DeclareQueue [<option> ...] <uri> <queue> [<exchange> <routingkey>] ...");
                     Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                    Console.Error.WriteLine("Parameters:");
+                    Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                     Console.Error.WriteLine("Available options:");
                     Console.Error.WriteLine("  /durable      declare a durable queue");
                     Console.Error.WriteLine("  /delete       delete after declaring");
diff --git a/projects/examples/client/ExceptionTest/src/examples/ExceptionTest.cs b/projects/examples/client/ExceptionTest/src/examples/ExceptionTest.cs
@@ -54,6 +54,8 @@ public static int Main(string[] args) {
                 if (args.Length < 1) {
                     Console.Error.WriteLine("Usage: ExceptionTest <uri>");
                     Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                    Console.Error.WriteLine("Parameters:");
+                    Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                     return 2;
                 }
 
diff --git a/projects/examples/client/LogTail/src/examples/LogTail.cs b/projects/examples/client/LogTail/src/examples/LogTail.cs
@@ -54,6 +54,8 @@ public static int Main(string[] args) {
             if (args.Length < 4) {
                 Console.Error.WriteLine("Usage: LogTail <uri> <exchange> <exchangetype> <routingkey>");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine(" <uri> = \"amqp://user:pass@host:port/vhost\"");
                 Console.Error.WriteLine("If the exchange name is the empty string, will instead declare a queue named");
                 Console.Error.WriteLine("by the routingkey, and consume from that queue.");
                 return 2;
diff --git a/projects/examples/client/LowlevelLogTail/src/examples/LowlevelLogTail.cs b/projects/examples/client/LowlevelLogTail/src/examples/LowlevelLogTail.cs
@@ -54,6 +54,8 @@ public static int Main(string[] args) {
             if (args.Length < 4) {
                 Console.Error.WriteLine("Usage: LowlevelLogTail <uri> <exchange> <exchangetype> <routingkey>");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                 Console.Error.WriteLine("If the exchange name is the empty string, will instead declare a queue named");
                 Console.Error.WriteLine("by the routingkey, and consume from that queue.");
                 return 2;
diff --git a/projects/examples/client/PerfTest/src/examples/PerfTest.cs b/projects/examples/client/PerfTest/src/examples/PerfTest.cs
@@ -53,6 +53,8 @@ public static int Main(string[] args) {
             if (args.Length < 2) {
                 Console.Error.WriteLine("Usage: PerfTest <uri> <number of messages>");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                 return 2;
             }
 
diff --git a/projects/examples/client/SendString/src/examples/SendString.cs b/projects/examples/client/SendString/src/examples/SendString.cs
@@ -49,6 +49,8 @@ public static int Main(string[] args) {
             if (args.Length < 5) {
                 Console.Error.WriteLine("Usage: SendString <uri> <exchange> <exchangetype> <routingkey> <message>");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                 return 2;
             }
             
diff --git a/projects/examples/client/ShutdownableClient/src/examples/ShutdownableClient.cs b/projects/examples/client/ShutdownableClient/src/examples/ShutdownableClient.cs
@@ -52,6 +52,8 @@ public static int Main(string[] args) {
             if (args.Length < 1) {
                 Console.Error.WriteLine("Usage: ShutdownableClient <uri> [<secondsdelay>]");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                 return 2;
             }
 
diff --git a/projects/examples/client/ShutdownableServer/src/examples/ShutdownableServer.cs b/projects/examples/client/ShutdownableServer/src/examples/ShutdownableServer.cs
@@ -52,6 +52,8 @@ public static int Main(string[] args) {
             if (args.Length < 1) {
                 Console.Error.WriteLine("Usage: ShutdownableServer <uri>");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                 return 2;
             }
 
diff --git a/projects/examples/client/SingleGet/src/examples/SingleGet.cs b/projects/examples/client/SingleGet/src/examples/SingleGet.cs
@@ -52,6 +52,8 @@ public static int Main(string[] args) {
             if (args.Length < 2) {
                 Console.Error.WriteLine("Usage: SingleGet <uri> <queuename>");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                 return 2;
             }
 
diff --git a/projects/examples/client/Subscriber/src/examples/Subscriber.cs b/projects/examples/client/Subscriber/src/examples/Subscriber.cs
@@ -51,6 +51,8 @@ public static int Main(string[] args) {
             if (args.Length < 1) {
                 Console.Error.WriteLine("Usage: Subscriber <uri> [<message count>]");
                 Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());
+                Console.Error.WriteLine("Parameters:");
+                Console.Error.WriteLine("  <uri> = \"amqp://user:pass@host:port/vhost\"");
                 return 2;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -140,13 +140,12 @@ private void ParseSuccess(string uri, string user, string password,`
`140`	`140`
`141`	`141`	`private void ParseFail(string uri)`
`142`	`142`	`{`
`143`		`- try {`
`144`		`- ConnectionFactory cf = new ConnectionFactory();`
`145`		`- cf.Uri = uri;`
`146`		`- Assert.Fail("URI parse didn't fail: '" + uri + "'");`
`147`		`- } catch (Exception) {`
`148`		`- // whoosh!`
`149`		`- }`
	`143`	`+ Assert.Throws(`
	`144`	`+ Is.InstanceOf<Exception>(),`
	`145`	`+ delegate {`
	`146`	`+ ConnectionFactory cf = new ConnectionFactory();`
	`147`	`+ cf.Uri = uri;`
	`148`	`+ });`
`150`	`149`	`}`
`151`	`150`	`}`
`152`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@ public static int Main(string[] args) {`
`52`	`52`	`if (args.Length < 1) {`
`53`	`53`	`Console.Error.WriteLine("Usage: AddClient <uri> [<number> ...]");`
`54`	`54`	`Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());`
	`55`	`+ Console.Error.WriteLine("Parameters:");`
	`56`	`+ Console.Error.WriteLine(" <uri> = \"amqp://user:pass@host:port/vhost\"");`
`55`	`57`	`return 2;`
`56`	`58`	`}`
`57`	`59`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ public static int Main(string[] args) {`
`53`	`53`	`if (args.Length < 1) {`
`54`	`54`	`Console.Error.WriteLine("Usage: AddServer <uri>");`
`55`	`55`	`Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());`
	`56`	`+ Console.Error.WriteLine("Parameters:");`
	`57`	`+ Console.Error.WriteLine(" <uri> = \"amqp://user:pass@host:port/vhost\"");`
`56`	`58`	`return 2;`
`57`	`59`	`}`
`58`	`60`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,8 @@ public static int Main(string[] args) {`
`74`	`74`	`{`
`75`	`75`	`Console.Error.WriteLine("Usage: DeclareQueue [<option> ...] <uri> <queue> [<exchange> <routingkey>] ...");`
`76`	`76`	`Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());`
	`77`	`+ Console.Error.WriteLine("Parameters:");`
	`78`	`+ Console.Error.WriteLine(" <uri> = \"amqp://user:pass@host:port/vhost\"");`
`77`	`79`	`Console.Error.WriteLine("Available options:");`
`78`	`80`	`Console.Error.WriteLine(" /durable declare a durable queue");`
`79`	`81`	`Console.Error.WriteLine(" /delete delete after declaring");`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ public static int Main(string[] args) {`
`54`	`54`	`if (args.Length < 1) {`
`55`	`55`	`Console.Error.WriteLine("Usage: ExceptionTest <uri>");`
`56`	`56`	`Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());`
	`57`	`+ Console.Error.WriteLine("Parameters:");`
	`58`	`+ Console.Error.WriteLine(" <uri> = \"amqp://user:pass@host:port/vhost\"");`
`57`	`59`	`return 2;`
`58`	`60`	`}`
`59`	`61`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ public static int Main(string[] args) {`
`49`	`49`	`if (args.Length < 5) {`
`50`	`50`	`Console.Error.WriteLine("Usage: SendString <uri> <exchange> <exchangetype> <routingkey> <message>");`
`51`	`51`	`Console.Error.WriteLine("RabbitMQ .NET client version "+typeof(IModel).Assembly.GetName().Version.ToString());`
	`52`	`+ Console.Error.WriteLine("Parameters:");`
	`53`	`+ Console.Error.WriteLine(" <uri> = \"amqp://user:pass@host:port/vhost\"");`
`52`	`54`	`return 2;`
`53`	`55`	`}`
`54`	`56`