Prefix --queue-pattern- prefix for --from and --to

And use printf-like format to expand queues names, e.g.
--queue-pattern perf-test-%d

References #64

Author: acogoluegnes

pom.xml

@@ -126,13 +126,15 @@
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-migrationsupport</artifactId>
       <version>${junit.jupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- for parameterized tests -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
       <version>${junit.jupiter.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>

src/main/java/com/rabbitmq/perf/MulticastParams.java

@@ -556,7 +556,7 @@ public SequenceTopologyHandler(MulticastParams params, int from, int to, String
             super(params);
             queues = new ArrayList<>(to - from + 1);
             for (int i = from; i <= to; i++) {
-                queues.add(queuePattern.replaceAll("\\$\\{i\\}", String.valueOf(i)));
+                queues.add(String.format(queuePattern, i));
             }
         }
 

src/main/java/com/rabbitmq/perf/PerfTest.java

@@ -302,8 +302,8 @@ private static Options getOptions() {
         options.addOption(new Option("v", "version",                false,"print version information"));
 
         options.addOption(new Option("qp", "queue-pattern",         true, "queue name pattern for creating queues in sequence"));
-        options.addOption(new Option("F", "from",                   true, "sequence start (included)"));
-        options.addOption(new Option("T", "to",                     true, "sequence end (included)"));
+        options.addOption(new Option("F", "queue-pattern-from",     true, "sequence start for queue pattern (included)"));
+        options.addOption(new Option("T", "queue-pattern-to",       true, "sequence end for queue pattern (included)"));
         return options;
     }
 

src/test/java/com/rabbitmq/perf/SequenceTopologyHandlerTest.java

@@ -31,7 +31,7 @@ public class SequenceTopologyHandlerTest {
 
     @Test
     public void sequence() {
-        handler = new MulticastParams.SequenceTopologyHandler(null, 1, 5, "test-${i}");
+        handler = new MulticastParams.SequenceTopologyHandler(null, 1, 5, "test-%d");
         assertThat(handler.getQueueNames(), allOf(iterableWithSize(5), hasItems("test-1", "test-2", "test-3", "test-4", "test-5")));
 
         assertThat(handler.getRoutingKey(), is("test-1"));
@@ -56,7 +56,7 @@ public void sequence() {
 
     @Test
     public void reset() {
-        handler = new MulticastParams.SequenceTopologyHandler(null, 1, 100, "test-${i}");
+        handler = new MulticastParams.SequenceTopologyHandler(null, 1, 100, "test-%d");
         assertThat(handler.getQueueNames(), hasSize(100));
 
         assertThat(handler.getRoutingKey(), is("test-1"));
@@ -76,4 +76,10 @@ public void reset() {
         assertThat(handler.getQueueNamesForClient(), allOf(iterableWithSize(1), hasItem("test-2")));
         assertThat(handler.getRoutingKey(), is("test-2"));
     }
+
+    @Test
+    public void format() {
+        handler = new MulticastParams.SequenceTopologyHandler(null, 1, 5, "test-%03d");
+        assertThat(handler.getQueueNames(), allOf(iterableWithSize(5), hasItems("test-001", "test-002", "test-003", "test-004", "test-005")));
+    }
 }

src/test/java/com/rabbitmq/perf/TopologyTest.java

@@ -336,11 +336,11 @@ public void differentMachinesConsumer() throws Exception {
             .queueBind(eq(queue), eq("direct"), eq(routingKey));
     }
 
-    // --queue-pattern 'perf-test-${i}' --from 1 --to 100
+    // --queue-pattern 'perf-test-%d' --queue-pattern-from 1 --queue-pattern-to 100
     @Test
     public void sequenceQueuesDefinition1to100() throws Exception {
         String queuePrefix = "perf-test-";
-        params.setQueuePattern(queuePrefix + "${i}");
+        params.setQueuePattern(queuePrefix + "%d");
         params.setQueueSequenceFrom(1);
         params.setQueueSequenceTo(100);
 
@@ -368,11 +368,11 @@ public void sequenceQueuesDefinition1to100() throws Exception {
         ));
     }
 
-    // --queue-pattern 'perf-test-${i}' --from 100 --to 500
+    // --queue-pattern 'perf-test-%d' --queue-pattern-from 100 --queue-pattern-to 500
     @Test
     public void sequenceQueuesDefinition100to500() throws Exception {
         String queuePrefix = "perf-test-";
-        params.setQueuePattern(queuePrefix + "${i}");
+        params.setQueuePattern(queuePrefix + "%d");
         params.setQueueSequenceFrom(100);
         params.setQueueSequenceTo(500);
 
@@ -400,11 +400,11 @@ public void sequenceQueuesDefinition100to500() throws Exception {
         ));
     }
 
-    //  --queue-pattern 'perf-test-${i}' --from 502 --to 5001
+    //  --queue-pattern 'perf-test-%d' --queue-pattern-from 502 --queue-pattern-to 5001
     @Test
     public void sequenceQueuesDefinition502to5001() throws Exception {
         String queuePrefix = "perf-test-";
-        params.setQueuePattern(queuePrefix + "${i}");
+        params.setQueuePattern(queuePrefix + "%d");
         params.setQueueSequenceFrom(502);
         params.setQueueSequenceTo(5001);
 
@@ -434,13 +434,13 @@ public void sequenceQueuesDefinition502to5001() throws Exception {
         ));
     }
 
-    // --queue-pattern 'perf-test-${i}' --from 1 --to 100 --producers 10 --consumers 0
+    // --queue-pattern 'perf-test-%d' --queue-pattern-from 1 --queue-pattern-to 100 --producers 10 --consumers 0
     @Test
     public void sequenceMoreQueuesThanProducers() throws Exception {
         String queuePrefix = "perf-test-";
         params.setConsumerCount(0);
         params.setProducerCount(10);
-        params.setQueuePattern(queuePrefix + "${i}");
+        params.setQueuePattern(queuePrefix + "%d");
         params.setQueueSequenceFrom(1);
         params.setQueueSequenceTo(100);
 
@@ -475,13 +475,13 @@ public void sequenceMoreQueuesThanProducers() throws Exception {
         ));
     }
 
-    // --queue-pattern 'perf-test-${i}' --from 1 --to 10 --producers 15 --consumers 30
+    // --queue-pattern 'perf-test-%d' --queue-pattern-from 1 --queue-pattern-to 10 --producers 15 --consumers 30
     @Test
     public void sequenceProducersAndConsumersSpread() throws Exception {
         String queuePrefix = "perf-test-";
         params.setConsumerCount(30);
         params.setProducerCount(15);
-        params.setQueuePattern(queuePrefix + "${i}");
+        params.setQueuePattern(queuePrefix + "%d");
         params.setQueueSequenceFrom(1);
         params.setQueueSequenceTo(10);
 
@@ -538,13 +538,13 @@ public void sequenceProducersAndConsumersSpread() throws Exception {
         ));
     }
 
-    // --queue-pattern 'perf-test-${i}' --from 101 --to 110 --producers 0 --consumers 110
+    // --queue-pattern 'perf-test-%d' --queue-pattern-from 101 --queue-pattern-to 110 --producers 0 --consumers 110
     @Test
     public void sequenceConsumersSpread() throws Exception {
         String queuePrefix = "perf-test-";
         params.setConsumerCount(110);
         params.setProducerCount(0);
-        params.setQueuePattern(queuePrefix + "${i}");
+        params.setQueuePattern(queuePrefix + "%d");
         params.setQueueSequenceFrom(101);
         params.setQueueSequenceTo(110);