cvs commit: avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/service ServiceRepositoryTestCase.java

[bloritsch]

bloritsch    2003/07/08 10:31:58

  Modified:    merlin/assembly/src/test/org/apache/avalon/assembly/engine/service
                        ServiceRepositoryTestCase.java
  Log:
  Test for the correct exceptions.  Failures are for tests where we tested for 
something but it did not pass.  Errors are for exceptions that are thrown that were 
not tested for.
  
  Revision  Changes    Path
  1.4       +33 -36    
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/service/ServiceRepositoryTestCase.java
  
  Index: ServiceRepositoryTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/service/ServiceRepositoryTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServiceRepositoryTestCase.java    29 Apr 2003 14:39:44 -0000      1.3
  +++ ServiceRepositoryTestCase.java    8 Jul 2003 17:31:58 -0000       1.4
  @@ -66,11 +66,6 @@
       private DefaultServiceRepository m_manager;
       protected ClassLoader m_loader = Thread.currentThread().getContextClassLoader();
   
  -    public ServiceRepositoryTestCase()
  -    {
  -        this( "ServiceRepositoryTestCase" );
  -    }
  -
       public ServiceRepositoryTestCase( String name )
       {
           super( name );
  @@ -91,11 +86,13 @@
           try
           {
               assertTrue( m_manager.createService( classname ) != null );
  -        } catch( Throwable e )
  +        }
  +        catch( ServiceException e )
           {
  -            System.out.println( "static operation failure for create type using : " 
+ classname );
  +            String message = "static operation failure for create type using : " + 
classname;
  +            System.out.println( message );
               e.printStackTrace();
  -            assertTrue( false );
  +            fail( message );
           }
       }
   
  @@ -104,15 +101,17 @@
           try
           {
               m_manager.createService( (String) null );
  -            assertTrue( false );
  -        } catch( NullPointerException e )
  +            fail( "Did not throw the expected NullPointerException" );
  +        }
  +        catch( NullPointerException e )
           {
               assertTrue( true );
  -        } catch( Throwable e )
  +        }
  +        catch( ServiceException e )
           {
               System.out.println( "static operation failure for create type using : " 
+ null );
  -            assertTrue( false );
               e.printStackTrace();
  +            fail( "Did not throw the proper exception" );
           }
       }
   
  @@ -121,18 +120,12 @@
           final String classname = "org.something.else";
           try
           {
  -            Service service = m_manager.createService( classname );
  -            assertTrue( false );
  -        } catch( ServiceException e )
  +            m_manager.createService( classname );
  +            fail( "Did not throw the expected ServiceException" );
  +        }
  +        catch( ServiceException e )
           {
               assertTrue( true );
  -        } catch( Throwable e )
  -        {
  -            System.out.println(
  -                    "static operation anti-failure for creation of invalid service 
using : "
  -                    + classname );
  -            e.printStackTrace();
  -            assertTrue( false );
           }
       }
   
  @@ -144,12 +137,12 @@
           try
           {
               m_manager.addService( service );
  -            assertTrue( true );
  +            // Success!!
           } catch( Throwable e )
           {
               System.out.println( "type addition failure" );
               e.printStackTrace();
  -            assertTrue( false );
  +            fail();
           }
   
           //
  @@ -160,10 +153,11 @@
           {
               m_manager.addService( service );
               System.out.println( "type replacement check failure" );
  -            assertTrue( false );
  -        } catch( Throwable e )
  +            fail();
  +        }
  +        catch( ServiceException e )
           {
  -            assertTrue( true );
  +            // Success!!
           }
   
           //
  @@ -172,13 +166,13 @@
   
           try
           {
  -            service.equals( m_manager.getService( service.getClassname(), 
service.getVersion() ) );
  -            assertTrue( true );
  -        } catch( Throwable e )
  +            assertEquals( service, m_manager.getService( service.getClassname(), 
service.getVersion() ) );
  +        }
  +        catch( ServiceException e )
           {
               System.out.println( "service retrival by classname/version failure" );
               e.printStackTrace();
  -            assertTrue( false );
  +            fail();
           }
   
           //
  @@ -188,12 +182,15 @@
           try
           {
               Version version = Version.getVersion( "111.111" );
  -            service.equals( m_manager.getService( service.getClassname(), version ) 
);
  -            System.out.println( "service retrival by classname/version failure on 
bad version" );
  -            assertTrue( false );
  -        } catch( Throwable e )
  +            assertEquals( service, m_manager.getService( service.getClassname(), 
version ) );
  +
  +            String message = "service retrival by classname/version failure on bad 
version";
  +            System.out.println( message );
  +            fail(message);
  +        }
  +        catch( ServiceException e )
           {
  -            assertTrue( true );
  +            // Success!!!
           }
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]