[jboss-svn-commits] JBL Code SVN: r30172 - labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic.

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

Author: whitingjr
Date: 2009-11-16 07:53:21 -0500 (Mon, 16 Nov 2009)
New Revision: 30172

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java
Log:


Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java	2009-11-16 12:52:16 UTC (rev 30171)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/auction/test/basic/ProfiledStateTransitions.java	2009-11-16 12:53:21 UTC (rev 30172)
@@ -52,8 +52,10 @@
 import org.dbunit.operation.DatabaseOperation;
 import org.hibernate.SessionFactory;
 import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.jbossts.performance.persistence.vendor.AbstractConstraint;
-import org.jboss.jbossts.performance.persistence.vendor.IntegrityConstraint;
+import org.jboss.jbossts.performance.persistence.vendor.AbstractVendorControl;
+import org.jboss.jbossts.performance.persistence.vendor.Constraint;
+import org.jboss.jbossts.performance.persistence.vendor.Purge;
+import org.jboss.jbossts.performance.persistence.vendor.SequenceSynchronizer;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterGroups;
 import org.testng.annotations.BeforeClass;
@@ -77,7 +79,7 @@
 
    protected SessionFactory hSessionFactory;
 
-   private IntegrityConstraint integrityConstraint;
+   private Constraint integrityConstraint;
 
    protected String SESSION_FACTORY_JNDI;
    
@@ -110,7 +112,7 @@
 
       if (null != constraint && !"".equals(constraint.trim()))
       {
-         AbstractConstraint abconstraint = (AbstractConstraint) Class.forName(constraint).newInstance();
+         AbstractVendorControl abconstraint = (AbstractVendorControl) Class.forName(constraint).newInstance();
          abconstraint.setTableNames(getTableNames(location));
          this.integrityConstraint = abconstraint;
       }
@@ -164,6 +166,7 @@
       {
          DatabaseConfig config = dbUnitCon.getConfig();
          config.setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, this.datatypeFactory);
+         //config.setProperty(DatabaseConfig.FEATURE_QUALIFIED_TABLE_NAMES, "true");
       }
 
       return dbUnitCon;
@@ -171,7 +174,7 @@
 
    protected void prepareSettings()
    {
-      beforeTestOperations.add(DatabaseOperation.CLEAN_INSERT);
+         beforeTestOperations.add(DatabaseOperation.CLEAN_INSERT);
    }
 
    @BeforeGroups(groups = "integration-warmup")
@@ -213,7 +216,13 @@
       // Create InitialContext from jndi.properties
       jndi = new InitialContext();
    }
-
+   
+   
+   @Override
+   public void beforeTestMethod() throws Exception 
+   {/* Override ancestor method as it is substituted */
+   }
+   
    @BeforeGroups(groups = "integration-warmup")
    @Parameters ({"basedata_location"})
    public void beforeTestMethod(String basedataLocation) throws Exception {
@@ -227,6 +236,8 @@
           {
              connectionConstraintModify = getConnection().getConnection();
              this.integrityConstraint.relax(connectionConstraintModify);
+              ((Purge)  this.integrityConstraint).purge(connectionConstraintModify);
+              ((SequenceSynchronizer)  this.integrityConstraint).synchronize(connectionConstraintModify);
           }
        }
        catch (SQLException sqle)
@@ -239,6 +250,7 @@
           connectionConstraintModify = null;
        }
        
+       
        for (DatabaseOperation op : beforeTestOperations ) {
           IDatabaseConnection idbConnection = null;
           Connection connection =  null;
@@ -276,6 +288,7 @@
        Profile.start();
    }
 
+   @Override
    @AfterGroups(groups = "integration-integration")
    public void afterTestMethod() throws Exception
    {