[jboss-svn-commits] JBoss Portal SVN: r5628 - in trunk/wsrp/src/main/org/jboss/portal: test/wsrp/other wsrp/producer/registration/impl

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-11-13 10:28:52 -0500 (Mon, 13 Nov 2006)
New Revision: 5628

Modified:
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerRegistryTestCase.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/registration/impl/RegistrationImpl.java
Log:
more testing of consumer registry

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerRegistryTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerRegistryTestCase.java	2006-11-13 15:08:33 UTC (rev 5627)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerRegistryTestCase.java	2006-11-13 15:28:52 UTC (rev 5628)
@@ -27,15 +27,20 @@
 import org.jboss.portal.wsrp.producer.registration.Consumer;
 import org.jboss.portal.wsrp.producer.registration.NoSuchRegistrationException;
 import org.jboss.portal.wsrp.producer.registration.DuplicateRegistrationException;
+import org.jboss.portal.wsrp.producer.registration.Registration;
+import org.jboss.portal.wsrp.producer.registration.RegistrationException;
 import org.jboss.portal.wsrp.producer.registration.impl.ConsumerRegistryImpl;
 import org.jboss.portal.wsrp.core.RegistrationData;
 import org.jboss.portal.wsrp.core.Property;
 import org.jboss.portal.wsrp.core.Extension;
 
+import javax.xml.soap.SOAPElement;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Map;
+import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -53,7 +58,16 @@
    public void setUp()
    {
       registry = new ConsumerRegistryImpl();
-      registrationData = new RegistrationData(null, null, false, new String[0], new String[0], new String[0], new String[0], new Property[0], new Extension[0]);
+      registrationData = new RegistrationData(
+         "Foo",
+         "Foo 1.0",
+         false,
+         new String[0],
+         new String[0],
+         new String[0],
+         new String[0],
+         new Property[]{new Property("prop1","","value1",new SOAPElement[0]),new Property("prop2","","value2",new SOAPElement[0])},
+         new Extension[0]);
    }
 
    protected void tearDown() throws Exception
@@ -154,7 +168,84 @@
 
    public void testAddRegistration() throws Exception
    {
-//      Consumer consumer = registry.addConsumer("Foo");
-//      consumer.addRegistration()
+      Consumer consumer = registry.addConsumer("Foo");
+      Registration reg1 = consumer.addRegistration(registrationData);
+      assertNotNull(reg1);
+      String regId = reg1.getId();
+      assertNotNull(regId);
+      assertEquals(consumer, reg1.getConsumer());
+      Map expectedProps = new HashMap();
+      expectedProps.put("prop1", "value1");
+      expectedProps.put("prop2", "value2");
+      assertEquals(expectedProps, reg1.getProperties());
+
+      // Retrieve it from the list of consumer registrations
+      Collection registrations = consumer.getRegistrations();
+      assertNotNull(registrations);
+      assertEquals(1, registrations.size());
+      Registration reg3 = (Registration)registrations.iterator().next();
+      assertEquals(regId, reg3.getId());
+      assertEquals(consumer, reg3.getConsumer());
+      assertEquals(expectedProps, reg3.getProperties());
+
+      // Retrieve the same registration from the registry
+      Registration reg2 = registry.getRegistration(regId);
+      assertNotNull(reg2);
+      assertEquals(regId, reg2.getId());
+      assertEquals(consumer, reg2.getConsumer());
+      assertEquals(expectedProps, reg2.getProperties());
    }
+
+   public void testAddRegistrationThrowsIAE() throws Exception
+   {
+      Consumer consumer = registry.addConsumer("Foo");
+      try
+      {
+         consumer.addRegistration(null);
+         fail();
+      }
+      catch (IllegalArgumentException expected)
+      {
+      }
+   }
+
+   public void testRemoveRegistrationThrowsIAE() throws Exception
+   {
+      try
+      {
+         registry.removeRegistration(null);
+         fail();
+      }
+      catch (IllegalArgumentException expected)
+      {
+      }
+   }
+
+   public void testRemoveRegistration() throws Exception
+   {
+      Consumer consumer = registry.addConsumer("Foo");
+      Registration reg = consumer.addRegistration(registrationData);
+      String regId = reg.getId();
+      registry.removeRegistration(regId);
+
+      //
+      Collection registrations = consumer.getRegistrations();
+      assertNotNull(registrations);
+      assertEquals(0, registrations.size());
+
+      //
+      assertEquals(null, registry.getRegistration(regId));
+   }
+
+   public void testRemoveConsumerRemoveRegistrations() throws Exception
+   {
+      Consumer consumer = registry.addConsumer("Foo");
+      Registration reg = consumer.addRegistration(registrationData);
+      String regId = reg.getId();
+
+      //
+      registry.removeConsumer("Foo");
+      assertEquals(null, registry.getRegistration(regId));
+   }
+
 }

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/registration/impl/RegistrationImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/registration/impl/RegistrationImpl.java	2006-11-13 15:08:33 UTC (rev 5627)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/registration/impl/RegistrationImpl.java	2006-11-13 15:28:52 UTC (rev 5628)
@@ -47,7 +47,6 @@
    final String id;
    ConsumerImpl consumer;
    private RegistrationStatus status;
-   private RegistrationData data;
    private Map properties;
 
 
@@ -56,7 +55,6 @@
       this.id = id;
       this.consumer = consumer;
       this.status = status;
-      this.data = data;
       this.properties = new HashMap(7);
 
       // Update state with data
@@ -64,6 +62,7 @@
       for (int i = 0; i < props.length; i++)
       {
          Property prop = props[i];
+         properties.put(prop.getName(), prop.getStringValue());
       }
    }