[Openbus-cvs-commits] Openbus/OpenbusJBI/src/test/org/openbus/jbi/framework/impl HashmapJBIRegistryImplTest.java,1.3,1.4 FileSystemRepositoryImplTest.java,1.3,1.4

[Esteban S. <es...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/framework/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23990/src/test/org/openbus/jbi/framework/impl

Modified Files:
	HashmapJBIRegistryImplTest.java 
	FileSystemRepositoryImplTest.java 
Log Message:
Adding more installation code

Index: FileSystemRepositoryImplTest.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/framework/impl/FileSystemRepositoryImplTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileSystemRepositoryImplTest.java	14 Jul 2005 23:10:59 -0000	1.3
--- FileSystemRepositoryImplTest.java	27 Jul 2005 00:22:49 -0000	1.4
***************
*** 22,28 ****
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
! import org.openbus.jbi.framework.ComponentConfig;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibrary;
  
  /**
--- 22,28 ----
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
! import org.openbus.jbi.framework.ComponentRuntimeInfo;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibraryInfo;
  
  /**
***************
*** 52,60 ****
              JBIRegistry reg = repository.retrieveRegistry();
              // add a library
!             SharedLibrary lib1 = new SharedLibrary(getLibraryDescription(
                      "Lib 1", "4.2"));
              reg.addSharedLibrary(lib1);
              // add a component
!             ComponentConfig comp1 = new ComponentConfig(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
              repository.storeRegistry(reg);
--- 52,60 ----
              JBIRegistry reg = repository.retrieveRegistry();
              // add a library
!             SharedLibraryInfo lib1 = new SharedLibraryInfo(getLibraryDescription(
                      "Lib 1", "4.2"));
              reg.addSharedLibrary(lib1);
              // add a component
!             ComponentRuntimeInfo comp1 = new ComponentRuntimeInfo(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
              repository.storeRegistry(reg);
***************
*** 86,90 ****
                      "UTF-8");
              log.debug("Zip name: " + zipName);
!             ComponentConfig comp1 = new ComponentConfig(getComponentDescription("Comp 1"));
              File compRoot = new File(repository.getComponentsPath(), comp1
                      .getUniqueName());
--- 86,90 ----
                      "UTF-8");
              log.debug("Zip name: " + zipName);
!             ComponentRuntimeInfo comp1 = new ComponentRuntimeInfo(getComponentDescription("Comp 1"));
              File compRoot = new File(repository.getComponentsPath(), comp1
                      .getUniqueName());
***************
*** 120,124 ****
                      .getFile(), "UTF-8");
              log.debug("Zip name: " + zipName);
!             SharedLibrary lib = new SharedLibrary(getLibraryDescription(
                      "BPEL Lib", "4.7"));
              File libRoot = new File(repository.getLibrariesPath(), "BPEL Lib"
--- 120,124 ----
                      .getFile(), "UTF-8");
              log.debug("Zip name: " + zipName);
!             SharedLibraryInfo lib = new SharedLibraryInfo(getLibraryDescription(
                      "BPEL Lib", "4.7"));
              File libRoot = new File(repository.getLibrariesPath(), "BPEL Lib"

Index: HashmapJBIRegistryImplTest.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/test/org/openbus/jbi/framework/impl/HashmapJBIRegistryImplTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HashmapJBIRegistryImplTest.java	14 Jul 2005 23:10:59 -0000	1.3
--- HashmapJBIRegistryImplTest.java	27 Jul 2005 00:22:49 -0000	1.4
***************
*** 18,25 ****
  import org.apache.commons.lang.SerializationUtils;
  import org.openbus.jbi.descriptor.SharedLibraryDesc;
! import org.openbus.jbi.framework.ComponentConfig;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibrary;
  
  /**
--- 18,25 ----
  import org.apache.commons.lang.SerializationUtils;
  import org.openbus.jbi.descriptor.SharedLibraryDesc;
! import org.openbus.jbi.framework.ComponentRuntimeInfo;
  import org.openbus.jbi.framework.FrameworkException;
  import org.openbus.jbi.framework.JBIRegistry;
! import org.openbus.jbi.framework.SharedLibraryInfo;
  
  /**
***************
*** 33,37 ****
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             SharedLibrary lib1 = new SharedLibrary(getLibraryDescription(
                      "Lib 1", "4.2"));
              reg.addSharedLibrary(lib1);
--- 33,37 ----
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             SharedLibraryInfo lib1 = new SharedLibraryInfo(getLibraryDescription(
                      "Lib 1", "4.2"));
              reg.addSharedLibrary(lib1);
***************
*** 47,51 ****
              // add 2nd lib with null version
              SharedLibraryDesc desc2 = getLibraryDescription("Lib 2", null);
!             SharedLibrary lib2 = new SharedLibrary(desc2);
              reg.addSharedLibrary(lib2);
              assertEquals(2, reg.getSharedLibraries().size());
--- 47,51 ----
              // add 2nd lib with null version
              SharedLibraryDesc desc2 = getLibraryDescription("Lib 2", null);
!             SharedLibraryInfo lib2 = new SharedLibraryInfo(desc2);
              reg.addSharedLibrary(lib2);
              assertEquals(2, reg.getSharedLibraries().size());
***************
*** 56,60 ****
              // add 3rd lib
              SharedLibraryDesc desc3 = getLibraryDescription("Lib 3", "3.2");
!             SharedLibrary lib3 = new SharedLibrary(desc3);
              reg.addSharedLibrary(lib3);
              assertEquals(4, reg.getSharedLibraries().size());
--- 56,60 ----
              // add 3rd lib
              SharedLibraryDesc desc3 = getLibraryDescription("Lib 3", "3.2");
!             SharedLibraryInfo lib3 = new SharedLibraryInfo(desc3);
              reg.addSharedLibrary(lib3);
              assertEquals(4, reg.getSharedLibraries().size());
***************
*** 74,78 ****
              // add 1st library
              SharedLibraryDesc desc1 = getLibraryDescription("Lib 1", "4.2");
!             SharedLibrary lib1 = new SharedLibrary(desc1);
              reg.addSharedLibrary(lib1);
              assertEquals(1, reg.getSharedLibraries().size());
--- 74,78 ----
              // add 1st library
              SharedLibraryDesc desc1 = getLibraryDescription("Lib 1", "4.2");
!             SharedLibraryInfo lib1 = new SharedLibraryInfo(desc1);
              reg.addSharedLibrary(lib1);
              assertEquals(1, reg.getSharedLibraries().size());
***************
*** 83,87 ****
              // add 2nd lib with null version
              SharedLibraryDesc desc2 = getLibraryDescription("Lib 2", null);
!             SharedLibrary lib2 = new SharedLibrary(desc2);
              reg.addSharedLibrary(lib2);
              assertEquals(3, reg.getSharedLibraries().size());
--- 83,87 ----
              // add 2nd lib with null version
              SharedLibraryDesc desc2 = getLibraryDescription("Lib 2", null);
!             SharedLibraryInfo lib2 = new SharedLibraryInfo(desc2);
              reg.addSharedLibrary(lib2);
              assertEquals(3, reg.getSharedLibraries().size());
***************
*** 120,126 ****
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             ComponentConfig comp1 = new ComponentConfig(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
!             assertEquals(1, reg.getComponents().size());
              // add duplicate component
              try {
--- 120,126 ----
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             ComponentRuntimeInfo comp1 = new ComponentRuntimeInfo(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
!             assertEquals(1, reg.getInstalledComponents().size());
              // add duplicate component
              try {
***************
*** 130,140 ****
              } catch (FrameworkException fe) {
              }
!             assertEquals(1, reg.getComponents().size());
              // add 2nd comp
!             ComponentConfig comp2 = new ComponentConfig(getComponentDescription("Comp 2"));
              reg.addComponent(comp2);
!             assertEquals(2, reg.getComponents().size());
!             assertSame(comp1, reg.getComponentConfig("Comp 1"));
!             assertSame(comp2, reg.getComponentConfig("Comp 2"));
          } catch (Exception e) {
              e.printStackTrace();
--- 130,140 ----
              } catch (FrameworkException fe) {
              }
!             assertEquals(1, reg.getInstalledComponents().size());
              // add 2nd comp
!             ComponentRuntimeInfo comp2 = new ComponentRuntimeInfo(getComponentDescription("Comp 2"));
              reg.addComponent(comp2);
!             assertEquals(2, reg.getInstalledComponents().size());
!             assertSame(comp1, reg.getComponentRuntimeInfo("Comp 1"));
!             assertSame(comp2, reg.getComponentRuntimeInfo("Comp 2"));
          } catch (Exception e) {
              e.printStackTrace();
***************
*** 147,160 ****
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             ComponentConfig comp1 = new ComponentConfig(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
!             assertEquals(1, reg.getComponents().size());
              // add 2nd comp
!             ComponentConfig comp2 = new ComponentConfig(getComponentDescription("Comp 2"));
              reg.addComponent(comp2);
!             assertEquals(2, reg.getComponents().size());
              // remove component 1
              reg.removeComponent("Comp 1");
!             assertEquals(1, reg.getComponents().size());
              assertFalse("Shouldn't be installed", reg
                      .isComponentInstalled("Comp 1"));
--- 147,160 ----
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             ComponentRuntimeInfo comp1 = new ComponentRuntimeInfo(getComponentDescription("Comp 1"));
              reg.addComponent(comp1);
!             assertEquals(1, reg.getInstalledComponents().size());
              // add 2nd comp
!             ComponentRuntimeInfo comp2 = new ComponentRuntimeInfo(getComponentDescription("Comp 2"));
              reg.addComponent(comp2);
!             assertEquals(2, reg.getInstalledComponents().size());
              // remove component 1
              reg.removeComponent("Comp 1");
!             assertEquals(1, reg.getInstalledComponents().size());
              assertFalse("Shouldn't be installed", reg
                      .isComponentInstalled("Comp 1"));
***************
*** 171,175 ****
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             SharedLibrary lib = new SharedLibrary(getLibraryDescription("Lib 1", "4.2"));
              reg.addSharedLibrary(lib);
              assertEquals(1, reg.getSharedLibraries().size());
--- 171,175 ----
              JBIRegistry reg = new HashmapJBIRegistryImpl();
              // add 1st library
!             SharedLibraryInfo lib = new SharedLibraryInfo(getLibraryDescription("Lib 1", "4.2"));
              reg.addSharedLibrary(lib);
              assertEquals(1, reg.getSharedLibraries().size());
***************
*** 180,184 ****
                      regCopy);
              assertEquals(1, regCopy.getSharedLibraries().size());
!             SharedLibrary libCopy = regCopy.getSharedLibrary("Lib 1");
              assertNotNull("Lib should be recovered from serialization", libCopy);
              assertEquals("4.2", libCopy.getVersion());
--- 180,184 ----
                      regCopy);
              assertEquals(1, regCopy.getSharedLibraries().size());
!             SharedLibraryInfo libCopy = regCopy.getSharedLibrary("Lib 1");
              assertNotNull("Lib should be recovered from serialization", libCopy);
              assertEquals("4.2", libCopy.getVersion());