[jboss-cvs] jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/util ...

[Christian Bauer]

  User: cbauer  
  Date: 07/08/17 09:00:32

  Modified:    examples/wiki/src/test/org/jboss/seam/wiki/test/util 
                        DBUnitSeamTest.java
  Log:
  Major refactoring of core data schema and some new features
  
  Revision  Changes    Path
  1.2       +26 -9     jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/util/DBUnitSeamTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DBUnitSeamTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/util/DBUnitSeamTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DBUnitSeamTest.java	11 Jul 2007 16:17:45 -0000	1.1
  +++ DBUnitSeamTest.java	17 Aug 2007 13:00:32 -0000	1.2
  @@ -1,3 +1,9 @@
  +/*
  + * JBoss, Home of Professional Open Source
  + *
  + * Distributable under LGPL license.
  + * See terms of license at gnu.org.
  + */
   package org.jboss.seam.wiki.test.util;
   
   import org.dbunit.database.DatabaseConfig;
  @@ -56,8 +62,8 @@
    * </p>
    * <dl>
    * <li>A TestNG test parameter named <tt>datasourceJndiName</tt> is provided by the TestNG test runner, which
  - * automatically calls <tt>setDatasourceJndiName()</tt> on the test class before a logical test runs.</li
  - * >
  + * automatically calls <tt>setDatasourceJndiName()</tt> on the test class before a logical test runs.</li>
  + * 
    * <li>An instance of a test class is created manually and the <tt>datasourceJndiName</tt> is passed as a
    * constructor argument.</li>
    *
  @@ -94,7 +100,7 @@
           this.datasourceJndiName = datasourceJndiName;
       }
   
  -    @BeforeTest
  +    @BeforeClass
       @Parameters("datasourceJndiName")
       public void setDatasourceJndiName(String datasourceJndiName) {
           this.datasourceJndiName = datasourceJndiName;
  @@ -122,13 +128,24 @@
       }
   
       private void executeOperations(List<DataSetOperation> list) {
  -        IDatabaseConnection con = getConnection();
  +        IDatabaseConnection con = null;
  +        try {
  +            con = getConnection();
           disableReferentialIntegrity(con);
           for (DataSetOperation op : list) {
               log.info("executing DBUnit operation: " + op);
               op.execute(con);
           }
           enableReferentialIntegrity(con);
  +        } finally {
  +            if (con != null) {
  +                try {
  +                    con.close();
  +                } catch (Exception ex) {
  +                    ex.printStackTrace(System.err);
  +                }
  +            }
  +        }
       }
   
       protected class DataSetOperation {