avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/extension/test ExtensionTestCase.java PackageRepositoryTestCase.java
Date Sat, 17 Nov 2001 11:36:02 GMT
donaldp     01/11/17 03:36:02

  Modified:    src/scratchpad/org/apache/avalon/excalibur/extension/test
                        ExtensionTestCase.java
                        PackageRepositoryTestCase.java
  Log:
  Update tests to latest code.
  
  Revision  Changes    Path
  1.5       +14 -14    jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/extension/test/ExtensionTestCase.java
  
  Index: ExtensionTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/extension/test/ExtensionTestCase.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExtensionTestCase.java	2001/11/17 05:17:45	1.4
  +++ ExtensionTestCase.java	2001/11/17 11:36:02	1.5
  @@ -17,7 +17,7 @@
    * TestCases for Extension. 
    *
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
  - * @version $Revision: 1.4 $ $Date: 2001/11/17 05:17:45 $
  + * @version $Revision: 1.5 $ $Date: 2001/11/17 11:36:02 $
    */
   public class ExtensionTestCase 
       extends TestCase
  @@ -78,7 +78,7 @@
           throws Exception
       {
           final Manifest manifest = getManifest( "manifest-1.mf" );
  -        final Extension[] available = Extension.getAvailableExtensions( manifest );
  +        final Extension[] available = Extension.getAvailable( manifest );
   
           assertEquals( "Available Count", 1, available.length );
           assertEquals( "Available Name", MF1_NAME, available[ 0 ].getExtensionName() );
  @@ -96,7 +96,7 @@
           throws Exception
       {
           final Manifest manifest = getManifest( "manifest-2.mf" );
  -        final Extension[] available = Extension.getAvailableExtensions( manifest );
  +        final Extension[] available = Extension.getAvailable( manifest );
   
           assertEquals( "Available Count", 1, available.length );
           assertEquals( "Available Name", MF2_NAME, available[ 0 ].getExtensionName() );
  @@ -109,7 +109,7 @@
           assertEquals( "Available ImpVersion", MF2_IVERSION, 
                         available[ 0 ].getImplementationVersion().toString() );
   
  -        final Extension[] required = Extension.getRequiredExtensions( manifest );
  +        final Extension[] required = Extension.getRequired( manifest );
           assertEquals( "Available Count", 1, required.length );
           assertEquals( "required Name", MFR1_NAME, required[ 0 ].getExtensionName() );
           assertEquals( "required SpecVendor", MFR1_SVENDOR, required[ 0 ].getSpecificationVendor()
);
  @@ -126,7 +126,7 @@
           throws Exception
       {
           final Manifest manifest = getManifest( "manifest-3.mf" );
  -        final Extension[] available = Extension.getAvailableExtensions( manifest );
  +        final Extension[] available = Extension.getAvailable( manifest );
   
           assertEquals( "Available Count", 1, available.length );
           assertEquals( "Available Name", MF3_NAME, available[ 0 ].getExtensionName() );
  @@ -139,7 +139,7 @@
           assertEquals( "Available ImpVersion", MF3_IVERSION, 
                         available[ 0 ].getImplementationVersion().toString() );
   
  -        final Extension[] required = Extension.getRequiredExtensions( manifest );
  +        final Extension[] required = Extension.getRequired( manifest );
           assertEquals( "Required Count", 1, required.length );
       }
   
  @@ -147,7 +147,7 @@
           throws Exception
       {
           final Manifest manifest = getManifest( "manifest-4.mf" );
  -        final Extension[] available = Extension.getAvailableExtensions( manifest );
  +        final Extension[] available = Extension.getAvailable( manifest );
   
           assertEquals( "Available Count", 1, available.length );
           assertEquals( "Available Name", MF4_NAME, available[ 0 ].getExtensionName() );
  @@ -160,7 +160,7 @@
           assertEquals( "Available ImpVersion", MF4_IVERSION, 
                         available[ 0 ].getImplementationVersion().toString() );
   
  -        final Extension[] required = Extension.getRequiredExtensions( manifest );
  +        final Extension[] required = Extension.getRequired( manifest );
           assertEquals( "Available Count", 0, required.length );
       }
   
  @@ -174,13 +174,13 @@
           final Manifest manifest6 = getManifest( "manifest-6.mf" );
           final Manifest manifest7 = getManifest( "manifest-7.mf" );
   
  -        final Extension req1 = Extension.getRequiredExtensions( manifest2 )[ 0 ];
  -        final Extension req2 = Extension.getRequiredExtensions( manifest5 )[ 0 ];
  -        final Extension req3 = Extension.getRequiredExtensions( manifest6 )[ 0 ];
  -        final Extension req4 = Extension.getRequiredExtensions( manifest7 )[ 0 ];
  +        final Extension req1 = Extension.getRequired( manifest2 )[ 0 ];
  +        final Extension req2 = Extension.getRequired( manifest5 )[ 0 ];
  +        final Extension req3 = Extension.getRequired( manifest6 )[ 0 ];
  +        final Extension req4 = Extension.getRequired( manifest7 )[ 0 ];
   
  -        final Extension avail3 = Extension.getAvailableExtensions( manifest3 )[ 0 ];
  -        final Extension avail4 = Extension.getAvailableExtensions( manifest4 )[ 0 ];
  +        final Extension avail3 = Extension.getAvailable( manifest3 )[ 0 ];
  +        final Extension avail4 = Extension.getAvailable( manifest4 )[ 0 ];
   
           assertTrue( "avail3.isCompatibleWith( req1 )", avail3.isCompatibleWith( req1 )
);
           assertTrue( "avail4.isCompatibleWith( req1 )", avail4.isCompatibleWith( req1 )
);
  
  
  
  1.7       +5 -5      jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/extension/test/PackageRepositoryTestCase.java
  
  Index: PackageRepositoryTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/extension/test/PackageRepositoryTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PackageRepositoryTestCase.java	2001/11/17 05:17:45	1.6
  +++ PackageRepositoryTestCase.java	2001/11/17 11:36:02	1.7
  @@ -23,7 +23,7 @@
    * TestCases for PackageRepository.
    *
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
  - * @version $Revision: 1.6 $ $Date: 2001/11/17 05:17:45 $
  + * @version $Revision: 1.7 $ $Date: 2001/11/17 11:36:02 $
    */
   public class PackageRepositoryTestCase
       extends TestCase
  @@ -90,7 +90,7 @@
           final PackageManager manager = new PackageManager( repository );
   
           final Manifest manifest2 = getManifest( "manifest-2.mf" );
  -        final Extension extension1 = Extension.getRequiredExtensions( manifest2 )[ 0 ];
  +        final Extension extension1 = Extension.getRequired( manifest2 )[ 0 ];
   
           final ArrayList dependencies = new ArrayList();
           final ArrayList unsatisfied = new ArrayList();
  @@ -156,9 +156,9 @@
           final InputStream inputStream = getClass().getResourceAsStream( manifestLocation
);
           final Manifest manifest = new Manifest( inputStream );
           final File file = new File( manifestLocation );
  -        final Extension[] available = Extension.getAvailableExtensions( manifest );
  -        final Extension[] required = Extension.getRequiredExtensions( manifest );
  +        final Extension[] available = Extension.getAvailable( manifest );
  +        final Extension[] required = Extension.getRequired( manifest );
   
  -        addOptionalPackage( new OptionalPackage( file, available, required ) );
  +        cacheOptionalPackage( new OptionalPackage( file, available, required ) );
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message