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

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

Author: dimitris at jboss.org
Date: 2007-02-13 14:13:10 -0500 (Tue, 13 Feb 2007)
New Revision: 60517

Modified:
   trunk/testsuite/src/main/org/jboss/test/tm/test/AbstractTransactionLocalStressTest.java
   trunk/testsuite/src/main/org/jboss/test/tm/test/TransactionLocalUnitTestCase.java
Log:
JBAS-4079, those tests target a local JBossTM, so make it explicit

Modified: trunk/testsuite/src/main/org/jboss/test/tm/test/AbstractTransactionLocalStressTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/tm/test/AbstractTransactionLocalStressTest.java	2007-02-13 19:10:21 UTC (rev 60516)
+++ trunk/testsuite/src/main/org/jboss/test/tm/test/AbstractTransactionLocalStressTest.java	2007-02-13 19:13:10 UTC (rev 60517)
@@ -1,31 +1,31 @@
 /*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.test.tm.test;
 
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
 import org.jboss.tm.TransactionLocal;
-import org.jboss.tm.TransactionManagerLocator;
+import org.jboss.tm.TxManager;
 
 /**
  * Abstract transaction local stress test.
@@ -35,7 +35,8 @@
  */
 public class AbstractTransactionLocalStressTest extends AbstractConcurrentStressTest
 {
-   protected TransactionManager tm = TransactionManagerLocator.getInstance().locate();
+   //protected TransactionManager tm = TransactionManagerLocator.getInstance().locate();
+   protected TransactionManager tm = TxManager.getInstance();
    protected TransactionLocal local = new TransactionLocal(tm); 
    
    public abstract class ConcurrentTransactionLocalRunnable extends ConcurrentRunnable

Modified: trunk/testsuite/src/main/org/jboss/test/tm/test/TransactionLocalUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/tm/test/TransactionLocalUnitTestCase.java	2007-02-13 19:10:21 UTC (rev 60516)
+++ trunk/testsuite/src/main/org/jboss/test/tm/test/TransactionLocalUnitTestCase.java	2007-02-13 19:13:10 UTC (rev 60517)
@@ -1,24 +1,24 @@
 /*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.test.tm.test;
 
 import javax.transaction.Transaction;
@@ -26,11 +26,12 @@
 
 import org.jboss.test.JBossTestCase;
 import org.jboss.tm.TransactionLocal;
-import org.jboss.tm.TransactionManagerLocator;
+import org.jboss.tm.TxManager;
 
 public class TransactionLocalUnitTestCase extends JBossTestCase
 {
-   protected TransactionManager tm = TransactionManagerLocator.getInstance().locate();
+   //protected TransactionManager tm = TransactionManagerLocator.getInstance().locate();
+   protected TransactionManager tm = TxManager.getInstance();
    
    public void testSimpleSetGet() throws Exception
    {