[infinispan-commits] Infinispan SVN: r1667 - trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed Apr 7 06:50:41 EDT 2010
Author: galder.zamarreno at jboss.com
Date: 2010-04-07 06:50:40 -0400 (Wed, 07 Apr 2010)
New Revision: 1667
Modified:
trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentTest.scala
trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodFunctionalTest.scala
trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleNodeTest.scala
trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodStatsTest.scala
Log:
Consolidate common test code.
Modified: trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentTest.scala
===================================================================
--- trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentTest.scala 2010-04-07 10:37:02 UTC (rev 1666)
+++ trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodConcurrentTest.scala 2010-04-07 10:50:40 UTC (rev 1667)
@@ -4,6 +4,8 @@
import java.util.concurrent.{Callable, Executors, Future, CyclicBarrier}
import test.HotRodClient
import org.testng.annotations.Test
+import org.infinispan.test.fwk.TestCacheManagerFactory
+import org.infinispan.manager.CacheManager
/**
* // TODO: Document this
@@ -13,6 +15,8 @@
@Test(groups = Array("functional"), testName = "server.hotrod.HotRodConcurrentTest")
class HotRodConcurrentTest extends HotRodSingleNodeTest {
+ override def createTestCacheManager: CacheManager = TestCacheManagerFactory.createLocalCacheManager(true)
+
def testConcurrentPutRequests(m: Method) {
val numClients = 10
val numOpsPerClient = 100
@@ -22,7 +26,6 @@
var operators: List[Operator] = List()
try {
for (i <- 0 until numClients) {
- // todo: add test with different client instances
val operator = new Operator(barrier, m, i, numOpsPerClient)
operators = operator :: operators
val future = executorService.submit(operator)
@@ -41,7 +44,7 @@
class Operator(barrier: CyclicBarrier, m: Method, clientId: Int, numOpsPerClient: Int) extends Callable[Unit] {
- private lazy val client = new HotRodClient("127.0.0.1", getServer.getPort, cacheName)
+ private lazy val client = new HotRodClient("127.0.0.1", server.getPort, cacheName)
def call {
log.debug("Wait for all executions paths to be ready to perform calls", null)
Modified: trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodFunctionalTest.scala
===================================================================
--- trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodFunctionalTest.scala 2010-04-07 10:37:02 UTC (rev 1666)
+++ trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodFunctionalTest.scala 2010-04-07 10:50:40 UTC (rev 1667)
@@ -1,15 +1,12 @@
package org.infinispan.server.hotrod
import org.infinispan.test.fwk.TestCacheManagerFactory
-import org.testng.annotations.{AfterClass, Test}
+import org.testng.annotations.Test
import java.lang.reflect.Method
-import test.HotRodClient
import test.HotRodTestingUtil._
import org.testng.Assert._
import java.util.Arrays
import org.infinispan.manager.{DefaultCacheManager, CacheManager}
-import org.infinispan.{AdvancedCache}
-import org.infinispan.test.{SingleCacheManagerTest}
import org.infinispan.server.core.CacheValue
import org.infinispan.server.hotrod.OperationStatus._
@@ -27,28 +24,10 @@
* @since 4.1
*/
@Test(groups = Array("functional"), testName = "server.hotrod.HotRodFunctionalTest")
-class HotRodFunctionalTest extends SingleCacheManagerTest {
- private val cacheName = "hotrod-cache"
- private var server: HotRodServer = _
- private var client: HotRodClient = _
- private var advancedCache: AdvancedCache[CacheKey, CacheValue] = _
+class HotRodFunctionalTest extends HotRodSingleNodeTest {
- override def createCacheManager: CacheManager = {
- val cacheManager = TestCacheManagerFactory.createLocalCacheManager(true)
- advancedCache = cacheManager.getCache[CacheKey, CacheValue](cacheName).getAdvancedCache
- server = startHotRodServer(cacheManager)
- client = new HotRodClient("127.0.0.1", server.getPort, cacheName)
- cacheManager
- }
-
- @AfterClass(alwaysRun = true)
- override def destroyAfterClass {
- super.destroyAfterClass
- log.debug("Test finished, close client and Hot Rod server", null)
- client.stop
- server.stop
- }
-
+ override def createTestCacheManager: CacheManager = TestCacheManagerFactory.createLocalCacheManager(true)
+
def testUnknownCommand(m: Method) {
val status = client.execute(0xA0, 0x77, cacheName, k(m) , 0, 0, v(m), 0)
assertTrue(status == UnknownOperation,
Modified: trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleNodeTest.scala
===================================================================
--- trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleNodeTest.scala 2010-04-07 10:37:02 UTC (rev 1666)
+++ trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleNodeTest.scala 2010-04-07 10:50:40 UTC (rev 1667)
@@ -5,10 +5,8 @@
import test.HotRodClient
import org.infinispan.AdvancedCache
import org.infinispan.manager.CacheManager
-import org.infinispan.test.fwk.TestCacheManagerFactory
import test.HotRodTestingUtil._
import org.testng.annotations.AfterClass
-import org.jboss.netty.logging.{InternalLoggerFactory, Log4JLoggerFactory}
/**
* // TODO: Document this
@@ -16,29 +14,34 @@
* @since // TODO
*/
abstract class HotRodSingleNodeTest extends SingleCacheManagerTest {
- val cacheName = "hotrod-cache"
- private var server: HotRodServer = _
- private var client: HotRodClient = _
+ val cacheName = "HotRodCache"
+ private var hotRodServer: HotRodServer = _
+ private var hotRodClient: HotRodClient = _
private var advancedCache: AdvancedCache[CacheKey, CacheValue] = _
- private var jmxDomain = getClass.getSimpleName
+ private var hotRodJmxDomain = getClass.getSimpleName
override def createCacheManager: CacheManager = {
- val cacheManager = TestCacheManagerFactory.createCacheManagerEnforceJmxDomain(jmxDomain)
+ val cacheManager = createTestCacheManager
advancedCache = cacheManager.getCache[CacheKey, CacheValue](cacheName).getAdvancedCache
- server = startHotRodServer(cacheManager)
- client = new HotRodClient("127.0.0.1", server.getPort, cacheName)
+ hotRodServer = startHotRodServer(cacheManager)
+ hotRodClient = new HotRodClient("127.0.0.1", hotRodServer.getPort, cacheName)
cacheManager
}
+ def createTestCacheManager: CacheManager
+
@AfterClass(alwaysRun = true)
override def destroyAfterClass {
log.debug("Test finished, close cache, client and Hot Rod server", null)
super.destroyAfterClass
- client.stop
- server.stop
+ hotRodClient.stop
+ hotRodServer.stop
}
- def getServer = server
+ def server = hotRodServer
- def getClient = client
+ def client = hotRodClient
+
+ def jmxDomain = hotRodJmxDomain
+
}
\ No newline at end of file
Modified: trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodStatsTest.scala
===================================================================
--- trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodStatsTest.scala 2010-04-07 10:37:02 UTC (rev 1666)
+++ trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodStatsTest.scala 2010-04-07 10:50:40 UTC (rev 1667)
@@ -1,15 +1,10 @@
package org.infinispan.server.hotrod
-import test.HotRodClient
import test.HotRodTestingUtil._
-import org.infinispan.test.SingleCacheManagerTest
-import org.testng.annotations.{AfterClass, Test}
+import org.testng.annotations.Test
import org.infinispan.test.fwk.TestCacheManagerFactory
-import org.infinispan.server.core.CacheValue
-import org.infinispan.AdvancedCache
import java.lang.reflect.Method
import org.testng.Assert._
-import org.infinispan.server.hotrod.OperationStatus._
import org.infinispan.manager.CacheManager
/**
@@ -18,29 +13,10 @@
* @since 4.1
*/
@Test(groups = Array("functional"), testName = "server.hotrod.FunctionalTest")
-class HotRodStatsTest extends SingleCacheManagerTest {
- private val cacheName = "hotrod-cache"
- private var server: HotRodServer = _
- private var client: HotRodClient = _
- private var advancedCache: AdvancedCache[CacheKey, CacheValue] = _
- private var jmxDomain = classOf[HotRodStatsTest].getSimpleName
+class HotRodStatsTest extends HotRodSingleNodeTest {
- override def createCacheManager: CacheManager = {
- val cacheManager = TestCacheManagerFactory.createCacheManagerEnforceJmxDomain(jmxDomain)
- advancedCache = cacheManager.getCache[CacheKey, CacheValue](cacheName).getAdvancedCache
- server = startHotRodServer(cacheManager)
- client = new HotRodClient("127.0.0.1", server.getPort, cacheName)
- cacheManager
- }
+ override def createTestCacheManager: CacheManager = TestCacheManagerFactory.createCacheManagerEnforceJmxDomain(jmxDomain)
- @AfterClass(alwaysRun = true)
- override def destroyAfterClass {
- super.destroyAfterClass
- log.debug("Test finished, close client and Hot Rod server", null)
- client.stop
- server.stop
- }
-
def testStats(m: Method) {
var s = client.stats
assertTrue(s.get("timeSinceStart") != 0)
More information about the infinispan-commits
mailing list