[jboss-cvs] JBossAS SVN: r96671 - projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web.

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

Author: remy.maucherat at jboss.com
Date: 2009-11-20 22:20:03 -0500 (Fri, 20 Nov 2009)
New Revision: 96671

Modified:
   projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java
   projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java
   projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
   projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java
   projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java
Log:
- Fix tests for type change.

Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java	2009-11-21 03:12:24 UTC (rev 96670)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java	2009-11-21 03:20:03 UTC (rev 96671)
@@ -273,14 +273,14 @@
       assertNotNull(servlet2);
       assertEquals("servlet2", servlet2.getId());
       assertEquals("org.jboss.test.web.servlets.ClasspathServlet", servlet2.getServletClass());
-      assertEquals(1, servlet2.getLoadOnStartup());
+      assertEquals("1", servlet2.getLoadOnStartup());
       // servlet10
       JBossServletMetaData servlet10 = jbossWeb.getServletByName("EJBOnStartupServlet");
       assertNotNull(servlet10);
       assertEquals("servlet10", servlet10.getId());
       assertEquals("EJBOnStartupServlet", servlet10.getServletName());
       assertEquals("org.jboss.test.web.servlets.EJBOnStartupServlet", servlet10.getServletClass());
-      assertEquals(1, servlet10.getLoadOnStartup());
+      assertEquals("1", servlet10.getLoadOnStartup());
       List<ParamValueMetaData> s10params = servlet10.getInitParam();
       assertEquals(1, s10params.size());
       ParamValueMetaData s10p0 = s10params.get(0);

Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java	2009-11-21 03:12:24 UTC (rev 96670)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/TomcatDeployerUnitTestCase.java	2009-11-21 03:20:03 UTC (rev 96671)
@@ -70,7 +70,7 @@
       assertEquals("web-app_2_4", webApp.getId());
       assertEquals("2.4", webApp.getVersion());
       assertNotNull(webApp.getServletByName("default"));
-      assertEquals(0, webApp.getServletByName("default").getLoadOnStartup());
+      assertEquals("0", webApp.getServletByName("default").getLoadOnStartup());
    }
    public void testConfweb25() throws Exception
    {

Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java	2009-11-21 03:12:24 UTC (rev 96670)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java	2009-11-21 03:20:03 UTC (rev 96671)
@@ -108,7 +108,7 @@
          assertEquals("servlet"+count, servlet.getId());
          assertEquals("servlet"+count+"-name", servlet.getServletName());
          assertEquals("servlet"+count+".class", servlet.getServletClass());
-         assertEquals(1, servlet.getLoadOnStartup());
+         assertEquals("1", servlet.getLoadOnStartup());
          assertEquals("run-as-role"+count, servlet.getRunAs().getRoleName());
          List<ParamValueMetaData> params = servlet.getInitParam();
          assertEquals(2, params.size());

Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java	2009-11-21 03:12:24 UTC (rev 96670)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java	2009-11-21 03:20:03 UTC (rev 96671)
@@ -131,7 +131,7 @@
          assertEquals("servlet"+count, servlet.getId());
          assertEquals("servlet"+count+"-name", servlet.getServletName());
          assertEquals("servlet"+count+".class", servlet.getServletClass());
-         assertEquals(1, servlet.getLoadOnStartup());
+         assertEquals("1", servlet.getLoadOnStartup());
          assertEquals("run-as-role"+count, servlet.getRunAs().getRoleName());
          List<ParamValueMetaData> params = servlet.getInitParam();
          assertEquals(2, params.size());

Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java	2009-11-21 03:12:24 UTC (rev 96670)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java	2009-11-21 03:20:03 UTC (rev 96671)
@@ -137,7 +137,7 @@
          assertEquals("servlet"+count, servlet.getId());
          assertEquals("servlet"+count+"-name", servlet.getServletName());
          assertEquals("servlet"+count+".class", servlet.getServletClass());
-         assertEquals(1, servlet.getLoadOnStartup());
+         assertEquals("1", servlet.getLoadOnStartup());
          assertEquals("run-as-role"+count, servlet.getRunAs().getRoleName());
          List<ParamValueMetaData> params = servlet.getInitParam();
          assertEquals(2, params.size());