[Smartfrog-checkins] core/components/deployapi/test/org/smartfrog/services/deployapi/test/unit LifecycleStateTest.java,NONE,1.1 PropertyMapTest.java,1.6,1.7

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/components/deployapi/test/org/smartfrog/services/deployapi/test/unit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10617/test/org/smartfrog/services/deployapi/test/unit

Modified Files:
	PropertyMapTest.java 
Added Files:
	LifecycleStateTest.java 
Log Message:
A week's worth of changes to the deployapi

--- NEW FILE: LifecycleStateTest.java ---
package org.smartfrog.services.deployapi.test.unit;

import junit.framework.TestCase;
import org.smartfrog.services.deployapi.system.LifecycleStateEnum;
import org.smartfrog.services.deployapi.transport.faults.BaseException;
import org.smartfrog.projects.alpine.om.base.SoapElement;
import nu.xom.Element;
import nu.xom.Node;

/**
 */
public class LifecycleStateTest extends TestCase {


    public void testXmlRoundTrip() throws Exception {
        for(LifecycleStateEnum state: LifecycleStateEnum.values()) {
            Element e=state.toCmpState();
            SoapElement base = makeParent(e);
            LifecycleStateEnum back=LifecycleStateEnum.extract(base);
        }
    }

    public void testNoParent() throws Exception {
        SoapElement base = makeParent(null);
        try {
            LifecycleStateEnum.extract(base);
            fail("should have bailed out");
        } catch (BaseException e) {
            //expected
        }
    }

    public void testUnknownState() throws Exception {
        SoapElement e = LifecycleStateEnum.undefined.toCmpState();
        Element child = (Element) e.getChild(0);
        child.setLocalName("madeupname");
        SoapElement base = makeParent(e);
        try {
            LifecycleStateEnum.extract(base);
            fail("should have bailed out");
        } catch (BaseException ex) {
            //expected
        }
    }

    private SoapElement makeParent(Element e) {
        SoapElement base =new SoapElement("parent",null);
        if(e!=null) {
            base.appendChild(e);
        }
        return base;
    }
}


Index: PropertyMapTest.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/test/org/smartfrog/services/deployapi/test/unit/PropertyMapTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PropertyMapTest.java	24 Apr 2006 17:13:11 -0000	1.6
--- PropertyMapTest.java	15 May 2006 15:18:57 -0000	1.7
***************
*** 30,33 ****
--- 30,34 ----
  import javax.xml.namespace.QName;
  import java.util.Date;
+ import java.util.List;
  
  /**
***************
*** 56,60 ****
  
      public void testAddLookupRemove() throws Exception {
!         Element result = map.getProperty(PROPNAME);
          assertNull(result);
          map.addStaticProperty(PROPNAME,
--- 57,61 ----
  
      public void testAddLookupRemove() throws Exception {
!         List<Element> result = map.getProperty(PROPNAME);
          assertNull(result);
          map.addStaticProperty(PROPNAME,
***************
*** 68,79 ****
  
      public void testAddLookupRemove2() throws Exception {
!         Property result = map.lookupProperty(Utils.convert(PROPNAME));
          assertNull(result);
          map.addStaticProperty(PROPNAME,
                  elt);
!         result = map.lookupProperty(Utils.convert(PROPNAME));
          assertNotNull(result);
          map.remove(result);
!         result = result = map.lookupProperty(Utils.convert(PROPNAME));
          assertNull(result);
      }
--- 69,80 ----
  
      public void testAddLookupRemove2() throws Exception {
!         Property result = map.lookupProperty(PROPNAME);
          assertNull(result);
          map.addStaticProperty(PROPNAME,
                  elt);
!         result = map.lookupProperty(PROPNAME);
          assertNotNull(result);
          map.remove(result);
!         result = result = map.lookupProperty(PROPNAME);
          assertNull(result);
      }
***************
*** 81,97 ****
  
      public void testAddStatic() throws Exception {
!         Property result = map.lookupProperty(Utils.convert(PROPNAME));
          assertNull(result);
          Element e =elt;
!         map.addStaticProperty(Utils.convert(PROPNAME),
                  e);
!         result = map.lookupProperty(Utils.convert(PROPNAME));
          assertNotNull(result);
!         Element value=result.getValue();
          assertSame(e,value);
!         value = map.getProperty(Utils.convert(PROPNAME));
          assertSame(e, value);
          map.remove(result);
!         result = result = map.lookupProperty(Utils.convert(PROPNAME));
          assertNull(result);
      }
--- 82,98 ----
  
      public void testAddStatic() throws Exception {
!         Property result = map.lookupProperty(PROPNAME);
          assertNull(result);
          Element e =elt;
!         map.addStaticProperty(PROPNAME,
                  e);
!         result = map.lookupProperty(PROPNAME);
          assertNotNull(result);
!         List<Element> value=result.getValue();
          assertSame(e,value);
!         value = map.getProperty(PROPNAME);
          assertSame(e, value);
          map.remove(result);
!         result = result = map.lookupProperty(PROPNAME);
          assertNull(result);
      }
***************
*** 100,109 ****
          final String text = Utils.toIsoTime(new Date());
          assertIsoDate(text);
!         map.addStaticProperty(Utils.convert(PROPNAME), text);
!         Property result = map.lookupProperty(Utils.convert(PROPNAME));
          assertNotNull(result);
!         Element value=result.getValue();
          assertEquals(text,value.getValue());
!         value = map.getProperty(Utils.convert(PROPNAME));
          assertEquals(text, value.getValue());
      }
--- 101,110 ----
          final String text = Utils.toIsoTime(new Date());
          assertIsoDate(text);
!         map.addStaticProperty(PROPNAME, text);
!         Property result = map.lookupProperty(PROPNAME);
          assertNotNull(result);
!         Element value=result.getValue().get(0);
          assertEquals(text,value.getValue());
!         value = map.getProperty(PROPNAME).get(0);
          assertEquals(text, value.getValue());
      }