[jboss-cvs] JBossAS SVN: r100946 - projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp.

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

Author: thomas.diesler at jboss.com
Date: 2010-02-14 05:55:47 -0500 (Sun, 14 Feb 2010)
New Revision: 100946

Modified:
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
Log:
Test servlet access before resource access

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java	2010-02-14 10:55:09 UTC (rev 100945)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java	2010-02-14 10:55:47 UTC (rev 100946)
@@ -53,7 +53,9 @@
 
       runtime = osgiTestHelper.getDefaultRuntime();
       runtime.addCapability(new HttpServiceCapability());
-      
+
+      // Conditionally install the webapp extender in case we test against
+      // a runtime where it is not installed already
       if (runtime.getBundle("org.ops4j.pax.web.pax-web-extender-war", null) == null)
          runtime.installBundle("bundles/pax-web-extender-war.jar").start();
       
@@ -68,13 +70,6 @@
    }
 
    @Test
-   public void testResourceAccess() throws Exception
-   {
-      String line = getHttpResponse("/message.txt", 5000);
-      assertEquals("Hello from Resource", line);
-   }
-
-   @Test
    public void testServletAccess() throws Exception
    {
       String line = getHttpResponse("/servlet?test=plain", 5000);
@@ -87,4 +82,11 @@
       String line = getHttpResponse("/servlet?test=initProp", 5000);
       assertEquals("initProp=SomeValue", line);
    }
+
+   @Test
+   public void testResourceAccess() throws Exception
+   {
+      String line = getHttpResponse("/message.txt", 5000);
+      assertEquals("Hello from Resource", line);
+   }
 }
\ No newline at end of file