[infinispan-commits] Infinispan SVN: r1657 - in trunk/client/hotrod-client/src: test/java/org/infinispan/client/hotrod and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2010-04-06 04:09:13 -0400 (Tue, 06 Apr 2010)
New Revision: 1657

Modified:
   trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java
   trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValueTest.java
   trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java
   trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/NettyHotRodIntegrationTest.java
Log:
ongoing work n hotrod client

Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java	2010-04-06 08:07:44 UTC (rev 1656)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java	2010-04-06 08:09:13 UTC (rev 1657)
@@ -128,7 +128,7 @@
          hotrodMarshaller = SerializationMarshaller.class.getName();
          log.info("'marshaller' not specified, using " + hotrodMarshaller);
       }
-      if (props.get("force-return-value") != null) {
+      if (props.get("force-return-value") != null && props.get("force-return-value").equals("true")) {
          throw new RuntimeException("force-return-value is not supported in Alpha1");
       }
       started = true;

Modified: trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValueTest.java
===================================================================
--- trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValueTest.java	2010-04-06 08:07:44 UTC (rev 1656)
+++ trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ForceReturnValueTest.java	2010-04-06 08:09:13 UTC (rev 1657)
@@ -25,7 +25,7 @@
  * @author Mircea.Markus at jboss.com
  * @since 4.1
  */
- at Test(testName = "client.hotrod.ForceReturnValueTest", groups = "functional")
+ at Test(testName = "client.hotrod.ForceReturnValueTest", groups = "functional", enabled = false)
 public class ForceReturnValueTest extends SingleCacheManagerTest {
    private Cache cache;
 

Modified: trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java
===================================================================
--- trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java	2010-04-06 08:07:44 UTC (rev 1656)
+++ trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java	2010-04-06 08:09:13 UTC (rev 1657)
@@ -50,7 +50,7 @@
 
       //pass the config file to the cache
       hotrodServer = HotRodTestingUtil.startHotRodServer(cacheManager);
-      
+
       remoteCacheManager = getRemoteCacheManager();
       defaultRemote = remoteCacheManager.getCache();
       remoteCache = remoteCacheManager.getCache(CACHE_NAME);
@@ -62,7 +62,7 @@
    }
 
 
-   @AfterClass (enabled = true)
+   @AfterClass 
    public void testDestroyRemoteCacheFactory() {
       assert remoteCache.ping();
       hotrodServer.stop();

Modified: trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/NettyHotRodIntegrationTest.java
===================================================================
--- trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/NettyHotRodIntegrationTest.java	2010-04-06 08:07:44 UTC (rev 1656)
+++ trunk/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/NettyHotRodIntegrationTest.java	2010-04-06 08:09:13 UTC (rev 1657)
@@ -11,8 +11,9 @@
  * @author Mircea.Marku127.0.0.1:11311;127.0.0.2:11411s at jboss.com
  * @since 4.1
  */
- at Test(testName = "hotrod.NettyHotRodIntegrationTest", groups = "functional")
+ at Test(testName = "hotrod.NettyHotRodIntegrationTest", groups = "functional", enabled = false)
 public class NettyHotRodIntegrationTest extends HotRodIntegrationTest {
+   
    @Override
    protected RemoteCacheManager getRemoteCacheManager() {
       Properties props = new Properties();