[Smartfrog-checkins] core/components/cargo/test/org/smartfrog/services/www/cargo/test/system CargoTest.java, 1.4, 1.5 CargoTestBase.java, 1.4, 1.5 testBase.sf, 1.2, 1.3

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

Update of /cvsroot/smartfrog/core/components/cargo/test/org/smartfrog/services/www/cargo/test/system
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9447/core/components/cargo/test/org/smartfrog/services/www/cargo/test/system

Modified Files:
	CargoTest.java CargoTestBase.java testBase.sf 
Log Message:
This is me reaching the end of my work with cargo, at least for a few days. Things dont work, but I'm reaching the limits of how hard I'm going try debugging it. Instead I want to do separate jboss, tomcat components and be done with it.

Index: CargoTest.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cargo/test/org/smartfrog/services/www/cargo/test/system/CargoTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CargoTest.java	9 Mar 2006 22:51:27 -0000	1.4
--- CargoTest.java	19 Jun 2006 14:33:56 -0000	1.5
***************
*** 20,25 ****
--- 20,29 ----
  package org.smartfrog.services.www.cargo.test.system;
  
+ import org.smartfrog.sfcore.prim.Prim;
+ import org.smartfrog.sfcore.common.SmartFrogLivenessException;
+ 
  
  public class CargoTest extends CargoTestBase {
+ 
      public CargoTest(String name) {
          super(name);
***************
*** 36,45 ****
  
      public void testBadCargoClass() throws Throwable {
!         deployExpectingException(FILE_BASE + "testBadCargoClass.sf",
!                 "testBadCargoClass",
!                 EXCEPTION_LIFECYCLE,
!                 "",
!                 EXCEPTION_SMARTFROG,
!                 "Cannot find org.codehaus.cargo.container.badConfigurationClass");
      }
  
--- 40,58 ----
  
      public void testBadCargoClass() throws Throwable {
!         Prim app = deployExpectingSuccess(FILE_BASE + "testBadCargoClass.sf",
!                 "testBadCargoClass");
!         long timeout = System.currentTimeMillis()+TIMEOUT_FOR_STARTUP *1000;
!         try {
!             do {
!                 app.sfPing(null);
!             } while(System.currentTimeMillis()<timeout);
!         } catch (SmartFrogLivenessException e) {
!             assertFaultCauseAndTextContains(e, EXCEPTION_LIFECYCLE,null,null);
!             assertFaultCauseAndTextContains(e.getCause(), EXCEPTION_SMARTFROG,
!                     "Cannot find org.codehaus.cargo.container.badConfigurationClass", "");
!         } catch (java.rmi.NoSuchObjectException terminated) {
!             //we get here if the thing terminated during the run
!         }
! 
      }
  

Index: CargoTestBase.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cargo/test/org/smartfrog/services/www/cargo/test/system/CargoTestBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CargoTestBase.java	9 Mar 2006 22:51:27 -0000	1.4
--- CargoTestBase.java	19 Jun 2006 14:33:56 -0000	1.5
***************
*** 23,26 ****
--- 23,33 ----
  import org.smartfrog.test.SmartFrogTestBase;
  import org.smartfrog.sfcore.prim.Prim;
+ import org.smartfrog.sfcore.common.SmartFrogResolutionException;
+ import org.smartfrog.sfcore.common.SmartFrogLivenessException;
+ import org.smartfrog.sfcore.common.SmartFrogException;
+ import org.smartfrog.services.www.LivenessPage;
+ import org.smartfrog.services.www.cargo.CargoServer;
+ 
+ import java.rmi.RemoteException;
  
  /**
***************
*** 32,35 ****
--- 39,43 ----
      /** Node of any deployed application */
      private Prim application;
+     private CargoServer server;
  
  
***************
*** 39,42 ****
--- 47,52 ----
  
      public static final String CODEBASE_PROPERTY = "org.smartfrog.codebase";
+     public static final int TIMEOUT_FOR_STARTUP = 30;
+     private LivenessPage happyPage;
  
  
***************
*** 78,85 ****
      }
  
  
!     protected void deployApp(String resource,String name) throws
              Throwable {
          setApplication(deployExpectingSuccess(resource, name));
      }
  }
--- 88,116 ----
      }
  
+     public CargoServer getServer() {
+         return server;
+     }
  
!     protected void deployAppServer(String resource,String name) throws
              Throwable {
          setApplication(deployExpectingSuccess(resource, name));
+         Prim serverAsPrim = application.sfResolve("server", (Prim) null, true);
+         server=(CargoServer) serverAsPrim;
+         happyPage = (LivenessPage) application.sfResolve("liveness", (Prim) null, true);
+         //allow a bit of a startup timeout here
+         long timeout = System.currentTimeMillis() + TIMEOUT_FOR_STARTUP * 1000;
+         try {
+             do {
+                 serverAsPrim.sfPing(null);
+             } while (System.currentTimeMillis() < timeout);
+         } catch (java.rmi.NoSuchObjectException terminated) {
+             //we get here if the thing terminated during the run
+             throw terminated;
+         }
+         checkWebSite();
+     }
+ 
+     protected void checkWebSite() throws SmartFrogException, RemoteException{
+         happyPage.checkPage();
      }
  }

Index: testBase.sf
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cargo/test/org/smartfrog/services/www/cargo/test/system/testBase.sf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testBase.sf	16 Jun 2006 16:36:46 -0000	1.2
--- testBase.sf	19 Jun 2006 14:33:56 -0000	1.3
***************
*** 43,60 ****
  AppServerWithWar extends AppServer {
  
  
-     deployedWar extends WebApplication {
-         server LAZY PARENT:server;
-         filename LAZY warlibraries:testwar:absolutePath;
-         contextPath "testwar";
-     }
  
!     ping extends LivenessPage {
!             host LAZY server:listener:ipaddr;
!             port server:port;
!             page LAZY deployedWar:absolutePath;
!             checkFrequency 1;
!             followRedirects true;
!     }
  
  }
--- 43,65 ----
  AppServerWithWar extends AppServer {
  
+   HomeDir extends TempDirWithCleanup {
+     prefix "cargo";
+   }
  
  
!   deployedWar extends WebApplication {
!       server LAZY PARENT:server;
!       filename LAZY warlibraries:testwar:absolutePath;
!       contextPath "testwar";
!   }
! 
!   liveness extends LivenessPage {
!           host LAZY server:listener:ipaddr;
!           port server:port;
!           page LAZY deployedWar:contextPath;
!           checkFrequency 1;
!           followRedirects true;
!           enabled false;
!   }
  
  }