[jboss-osgi-commits] JBoss-OSGI SVN: r100693 - projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp.

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

Author: thomas.diesler at jboss.com
Date: 2010-02-08 06:45:35 -0500 (Mon, 08 Feb 2010)
New Revision: 100693

Modified:
   projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java
   projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
Log:
Give more time to webextender

Modified: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java
===================================================================
--- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java	2010-02-08 10:21:14 UTC (rev 100692)
+++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java	2010-02-08 11:45:35 UTC (rev 100693)
@@ -46,11 +46,10 @@
    protected String getHttpResponse(String reqPath, int timeout) throws Exception
    {
       int fraction = 200;
-      int steps = Math.max(timeout / fraction, 1);
       
       String line = null;
       IOException lastException = null;
-      while (line == null && 0 < steps--)
+      while (line == null && 0 < (timeout -= fraction))
       {
          try
          {

Modified: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
===================================================================
--- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java	2010-02-08 10:21:14 UTC (rev 100692)
+++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java	2010-02-08 11:45:35 UTC (rev 100693)
@@ -47,7 +47,7 @@
    private static OSGiRuntime runtime;
 
    @BeforeClass
-   public static void setUpClass() throws Exception
+   public static void beforeClass() throws Exception
    {
       OSGiTestHelper osgiTestHelper = new OSGiTestHelper();
 
@@ -61,7 +61,7 @@
    }
 
    @AfterClass
-   public static void tearDownClass() throws Exception
+   public static void afterClass() throws Exception
    {
       runtime.shutdown();
       runtime = null;
@@ -70,21 +70,21 @@
    @Test
    public void testResourceAccess() throws Exception
    {
-      String line = getHttpResponse("/message.txt", 5000);
+      String line = getHttpResponse("/message.txt", 10000);
       assertEquals("Hello from Resource", line);
    }
 
    @Test
    public void testServletAccess() throws Exception
    {
-      String line = getHttpResponse("/servlet?test=plain", 5000);
+      String line = getHttpResponse("/servlet?test=plain", 10000);
       assertEquals("Hello from Servlet", line);
    }
 
    @Test
    public void testServletInitProps() throws Exception
    {
-      String line = getHttpResponse("/servlet?test=initProp", 5000);
+      String line = getHttpResponse("/servlet?test=initProp", 10000);
       assertEquals("initProp=SomeValue", line);
    }
 }
\ No newline at end of file