[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex ...

[Ron Sigal]

  User: rsigal  
  Date: 06/11/06 22:05:30

  Modified:    src/tests/org/jboss/test/remoting/transport/multiplex  
                        MultiplexInvokerTestClient.java
                        MultiplexInvokerTestServer.java
  Log:
  JBREM-577:  Changed /?& to /? in URL's.
  
  Revision  Changes    Path
  1.22      +2 -2      JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/MultiplexInvokerTestClient.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MultiplexInvokerTestClient.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/MultiplexInvokerTestClient.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- MultiplexInvokerTestClient.java	23 Jul 2006 07:20:10 -0000	1.21
  +++ MultiplexInvokerTestClient.java	7 Nov 2006 03:05:30 -0000	1.22
  @@ -882,7 +882,7 @@
   
            InvokerLocator serverLocator = new InvokerLocator(transport +
                                                              "://" + serverHost + ":" + serverPort +
  -                                                           "/?&timeout=60000");
  +                                                           "/?timeout=60000");
   
            tester.createRemotingClient(serverLocator.getLocatorURI());
            assertTrue(InvokerRegistry.isClientInvokerRegistered(serverLocator));
  @@ -1152,7 +1152,7 @@
   
            InvokerLocator serverLocator = new InvokerLocator(transport + "://" + serverHost +
                                                              ":" + serverPort +
  -                                                           "/?&timeout=60000");
  +                                                           "/?timeout=60000");
   
   
            InetSocketAddress connectAddress = new InetSocketAddress(serverHost, serverPort);
  
  
  
  1.17      +11 -11    JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/MultiplexInvokerTestServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MultiplexInvokerTestServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/multiplex/MultiplexInvokerTestServer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- MultiplexInvokerTestServer.java	23 May 2006 17:31:57 -0000	1.16
  +++ MultiplexInvokerTestServer.java	7 Nov 2006 03:05:30 -0000	1.17
  @@ -128,53 +128,53 @@
         virtualServerSocketTestConnectPort = getVirtualServerSocketTestConnectPort();
   	   
         // timeout - 7070
  -      String locatorURI = getTransport() + "://" + host + ":" + port + "/?&timeout=1200000";
  +      String locatorURI = getTransport() + "://" + host + ":" + port + "/?timeout=1200000";
         TestThread t1 = new TestThread(locatorURI, true);
         t1.start();
         
         // case 1a - 7071
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         new TestThread(locatorURI, false).start();
         
         // case 1b - 7072
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         new TestThread(locatorURI, false).start();
         
         // case 2a - 7073
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         new TestThread(locatorURI, false).start();
         
         // case 2b - 7074
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         new TestThread(locatorURI, false).start();
         
         // case 3a - 7075
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         new TestThread(locatorURI, false).start();
         
         // case 3b - 7076
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         new TestThread(locatorURI, false).start();
         
         // case 4a - 7077
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         TestThread t8 = new TestThread(locatorURI, false);
         t8.start();
         
         // case 4b - 7078
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         TestThread t9 = new TestThread(locatorURI, false);
         t9.start();
         
         
         // testInconsistentClientParameters() - 7079
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         TestThread t10 = new TestThread(locatorURI, false);
         t10.start();
         
         
         // testInconsistentServerParameters() - 7080
  -      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?&timeout=1200000";
  +      locatorURI = getTransport() + "://" + host + ":" + ++port + "/?timeout=1200000";
         TestThread t11 = new TestThread(locatorURI, false);
         t11.start();