From: Steve L. <st...@us...> - 2005-09-23 13:09:39
|
Update of /cvsroot/smartfrog/core/components/deployapi/test/org/smartfrog/services/deployapi/test/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10452/components/deployapi/test/org/smartfrog/services/deployapi/test/system Modified Files: ApiTestBase.java PortalTest.java Log Message: resources Index: ApiTestBase.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/deployapi/test/org/smartfrog/services/deployapi/test/system/ApiTestBase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ApiTestBase.java 22 Sep 2005 17:08:59 -0000 1.3 --- ApiTestBase.java 23 Sep 2005 13:09:30 -0000 1.4 *************** *** 168,170 **** --- 168,181 ---- return systemEndpointer; } + + /** + * Terminate a system if it is not null + * @param system + * @throws RemoteException + */ + public void terminateSystem(SystemEndpointer system) throws RemoteException { + if(system!=null) { + getOperation().terminate(system,"end of test"); + } + } } Index: PortalTest.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/deployapi/test/org/smartfrog/services/deployapi/test/system/PortalTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PortalTest.java 22 Sep 2005 17:08:59 -0000 1.2 --- PortalTest.java 23 Sep 2005 13:09:30 -0000 1.3 *************** *** 23,28 **** import org.smartfrog.services.deployapi.system.Constants; import org.apache.axis2.AxisFault; ! import java.rmi.RemoteException; /** --- 23,31 ---- import org.smartfrog.services.deployapi.system.Constants; import org.apache.axis2.AxisFault; + import org.ggf.xbeans.cddlm.api.StaticPortalStatusType; + import org.ggf.xbeans.cddlm.api.PortalInformationType; + import org.ggf.xbeans.cddlm.wsrf.wsrp.GetResourcePropertyResponseDocument; ! import nu.xom.Element; /** *************** *** 64,77 **** } ! /** ! * Terminate a system if it is not null ! * @param system ! * @throws RemoteException ! */ ! public void terminateSystem(SystemEndpointer system) throws RemoteException { ! if(system!=null) { ! getOperation().terminate(system,"end of test"); ! } } } --- 67,89 ---- } ! public void testPortalResourceID() throws Exception { ! String id =getOperation().getResourcePropertyText(Constants.PROPERTY_MUWS_RESOURCEID); ! log.info("Portal resource ID="+id); ! String id2= getOperation().getResourcePropertyText(Constants.PROPERTY_MUWS_RESOURCEID); ! assertEquals(id,id2); ! } ! ! public void testStaticPortalStatus() throws Exception { ! Element graph= getOperation().getResourcePropertyXom(Constants.PROPERTY_PORTAL_STATIC_PORTAL_STATUS); ! GetResourcePropertyResponseDocument responseDoc; ! responseDoc = getOperation().getPropertyResponse(Constants.PROPERTY_PORTAL_STATIC_PORTAL_STATUS); ! GetResourcePropertyResponseDocument.GetResourcePropertyResponse response; ! response = responseDoc.getGetResourcePropertyResponse(); ! StaticPortalStatusType status; ! status =StaticPortalStatusType.Factory.parse(response.getDomNode()); ! PortalInformationType portal = status.getPortal(); ! portal.getName(); } + } |