svn commit: r1381981 - in /activemq/trunk/activemq-core/src/test/java/org/apache/activemq: broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java config/ConfigTest.java

[dejanb]

Author: dejanb
Date: Fri Sep  7 11:34:50 2012
New Revision: 1381981

URL: http://svn.apache.org/viewvc?rev=1381981&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4005 - remove deprecated API warning 
from tests

Modified:
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java?rev=1381981&r1=1381980&r2=1381981&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java
 Fri Sep  7 11:34:50 2012
@@ -36,7 +36,7 @@ public class DbRestartJDBCQueueMasterSla
         super.configureJdbcPersistenceAdapter(persistenceAdapter);
         
persistenceAdapter.setLockAcquireSleepInterval(getLockAcquireSleepInterval());
         persistenceAdapter.setLockKeepAlivePeriod(getLockKeepAlivePeriod());
-        persistenceAdapter.setDatabaseLocker(new LeaseDatabaseLocker());
+        persistenceAdapter.setLocker(new LeaseDatabaseLocker());
     }
 
     private long getLockKeepAlivePeriod() {

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java?rev=1381981&r1=1381980&r2=1381981&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
 Fri Sep  7 11:34:50 2012
@@ -191,7 +191,7 @@ public class ConfigTest extends TestCase
         }});
 
         adapter.start();
-        assertTrue("has the locker override", adapter.getDatabaseLocker() 
instanceof TransactDatabaseLocker);
+        assertTrue("has the locker override", adapter.getLocker() instanceof 
TransactDatabaseLocker);
         adapter.stop();
     }
 
@@ -220,7 +220,7 @@ public class ConfigTest extends TestCase
         }});
 
         adapter.start();
-        assertEquals("has the default locker", 
adapter.getDatabaseLocker().getClass(), DefaultDatabaseLocker.class);
+        assertEquals("has the default locker", adapter.getLocker().getClass(), 
DefaultDatabaseLocker.class);
         adapter.stop();
     }