[jboss-cvs] JBossAS SVN: r66051 - trunk/testsuite/src/main/org/jboss/test/jca/test.

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

Author: weston.price at jboss.com
Date: 2007-10-11 17:43:31 -0400 (Thu, 11 Oct 2007)
New Revision: 66051

Modified:
   trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java
Log:
[JBAS-4817] Modify *-ds.xml files to compensate for JAXB marshalling issue while dealing with XML booleans.Clean up testcase.

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java	2007-10-11 21:42:57 UTC (rev 66050)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java	2007-10-11 21:43:31 UTC (rev 66051)
@@ -200,9 +200,10 @@
       assertTrue(count.intValue() != min.intValue());
       
       InitialContext ctx = new InitialContext();
-      DataSource ds = (DataSource)ctx.lookup("CriPreFillDS");
+      DataSource ds = (DataSource)ctx.lookup("java:/CriPreFillDS");
       Connection conn = ds.getConnection("sa", "");
       
+      Thread.sleep(10000);
       count = (Integer)getServer().getAttribute(CRI_PREFILL_POOL, CONN_NAME);
       min = (Integer)getServer().getAttribute(CRI_PREFILL_POOL, MIN_NAME);
       
@@ -212,7 +213,7 @@
       
       //Now we explictly set prefill, flush
       Attribute flush = new Attribute(PREFILL, Boolean.TRUE);
-      getServer().setAttribute(PREFILL_POOL, flush);
+      getServer().setAttribute(CRI_PREFILL_POOL, flush);
       getServer().invoke(CRI_PREFILL_POOL, FLUSH_METHOD_NAME, new Object[0], new String[0]);
       
       count = (Integer)getServer().getAttribute(CRI_PREFILL_POOL, CONN_NAME);
@@ -221,12 +222,13 @@
       assertTrue(count.intValue() != min.intValue());
       
       conn = ds.getConnection("sa", "");
+      Thread.currentThread().sleep(10000);
       
       count = (Integer)getServer().getAttribute(CRI_PREFILL_POOL, CONN_NAME);
       min = (Integer)getServer().getAttribute(CRI_PREFILL_POOL, MIN_NAME);
-      
+
       assertTrue(count.intValue() == min.intValue());
-      
+      conn.close();
    }