[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/callback/exception ...

[Ovidiu Feodorov]

  User: ovidiu  
  Date: 07/01/24 21:51:44

  Modified:    src/tests/org/jboss/test/remoting/callback/exception    Tag:
                        remoting_2_x CallbackTestCase.java
                        CallbackTestClient.java CallbackTestServer.java
  Log:
  fixed http://jira.jboss.org/jira/browse/JBREM-689; not added test cases though because I couldn't figure how to use existing CallbackTestCase
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.10.2  +0 -6      JBossRemoting/src/tests/org/jboss/test/remoting/callback/exception/CallbackTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CallbackTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/callback/exception/CallbackTestCase.java,v
  retrieving revision 1.1.10.1
  retrieving revision 1.1.10.2
  diff -u -b -r1.1.10.1 -r1.1.10.2
  --- CallbackTestCase.java	6 Dec 2006 05:26:03 -0000	1.1.10.1
  +++ CallbackTestCase.java	25 Jan 2007 02:51:44 -0000	1.1.10.2
  @@ -51,8 +51,6 @@
       * How long to wait for test results to be returned from the client(s).  If goes longer than the
       * specified limit, will throw an exception and kill the running test cases.  Default value is
       * RESULTS_TIMEOUT.
  -    *
  -    * @return
       */
      protected long getResultsTimeout()
      {
  @@ -62,8 +60,6 @@
      /**
       * How long for the server test case to wait for tear down message.  If exceeds timeout,
       * will throw exception.  The default value is TEARDOWN_TIMEOUT.
  -    *
  -    * @return
       */
      protected long getTearDownTimeout()
      {
  @@ -73,8 +69,6 @@
      /**
       * How long to allow each of the test cases to run their tests.  If exceeds this timeout
       * will throw exception and kill tests.  The default value is RUN_TEST_TIMEOUT.
  -    *
  -    * @return
       */
      protected long getRunTestTimeout()
      {
  
  
  
  1.4.4.1   +1 -4      JBossRemoting/src/tests/org/jboss/test/remoting/callback/exception/CallbackTestClient.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CallbackTestClient.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/callback/exception/CallbackTestClient.java,v
  retrieving revision 1.4
  retrieving revision 1.4.4.1
  diff -u -b -r1.4 -r1.4.4.1
  --- CallbackTestClient.java	23 Jun 2006 20:43:38 -0000	1.4
  +++ CallbackTestClient.java	25 Jan 2007 02:51:44 -0000	1.4.4.1
  @@ -103,7 +103,6 @@
   
      public void testPushCallback() throws Throwable
      {
  -
         CallbackHandler callbackHandler = new CallbackHandler();
   
         try
  @@ -163,13 +162,11 @@
               connector.destroy();
            }
   
  -
            Thread.currentThread().sleep(50000);
         }
  -
  -
      }
   
  +
      public void setupServer(InvokerLocator locator) throws Exception
      {
         log.info("Starting remoting server with locator uri of: " + locator);
  
  
  
  1.1.10.1  +7 -2      JBossRemoting/src/tests/org/jboss/test/remoting/callback/exception/CallbackTestServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CallbackTestServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/callback/exception/CallbackTestServer.java,v
  retrieving revision 1.1
  retrieving revision 1.1.10.1
  diff -u -b -r1.1 -r1.1.10.1
  --- CallbackTestServer.java	3 Jan 2006 06:34:46 -0000	1.1
  +++ CallbackTestServer.java	25 Jan 2007 02:51:44 -0000	1.1.10.1
  @@ -100,7 +100,7 @@
                  Iterator itr = listeners.iterator();
                  while(itr.hasNext())
                  {
  -                  InvokerCallbackHandler callbackHandler = (InvokerCallbackHandler) itr.next();
  +                  InvokerCallbackHandler callbackHandler = (InvokerCallbackHandler)itr.next();
                     try
                     {
                        callbackHandler.handleCallback(callback);
  @@ -130,6 +130,11 @@
   
      }
   
  +   public void testFailurePropagationOnCallbackError()
  +   {
  +      // TODO
  +   }
  +
      public static void main(String[] args)
      {
         try
  @@ -137,6 +142,7 @@
            CallbackTestServer server = new CallbackTestServer();
            server.setUp();
            server.testCallbackError();
  +         server.testFailurePropagationOnCallbackError();
         }
         catch(Exception e)
         {
  @@ -144,7 +150,6 @@
         }
      }
   
  -
      /**
       * called to handle a specific invocation
       *