svn commit: r1341443 - in /camel/branches/camel-2.9.x: ./ components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/

[davsclaus]

Author: davsclaus
Date: Tue May 22 12:28:08 2012
New Revision: 1341443

URL: http://svn.apache.org/viewvc?rev=1341443&view=rev
Log:
Fixed test on windows

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
    
camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1341441

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java?rev=1341443&r1=1341442&r2=1341443&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
 Tue May 22 12:28:08 2012
@@ -120,9 +120,6 @@ public class ZooKeeperTestSupport extend
         private void cleanZookeeperDir() throws Exception {
             File working = zookeeperBaseDir;
             deleteDir(working);
-            if (working.exists()) {
-                throw new Exception("Could not delete Test Zookeeper Server 
working dir " + zookeeperBaseDir);
-            }
         }
 
         public void shutdown() throws Exception {
@@ -133,7 +130,7 @@ public class ZooKeeperTestSupport extend
                 zkServer.shutdown();
                 Thread.sleep(100);
             }
-            //cleanZookeeperDir();
+            cleanZookeeperDir();
         }
     }
 
@@ -169,7 +166,6 @@ public class ZooKeeperTestSupport extend
         public void create(String node, String data) throws Exception {
             log.debug(String.format("Creating node '%s' with data '%s' ", 
node, data));
             create(node, data, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
-
         }
 
         public void createPersistent(String node, String data) throws 
Exception {
@@ -195,7 +191,6 @@ public class ZooKeeperTestSupport extend
         }
 
         public void process(WatchedEvent event) {
-
             if (event.getState() == KeeperState.SyncConnected) {
                 log.info("TestClient connected");
                 connected.countDown();

Modified: 
camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java?rev=1341443&r1=1341442&r2=1341443&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
 Tue May 22 12:28:08 2012
@@ -39,8 +39,7 @@ public class CreateOperationTest extends
 
     @Test
     public void createBasic() throws Exception {
-
-        CreateOperation create = new CreateOperation(connection, "/one");
+         CreateOperation create = new CreateOperation(connection, "/one");
 
         OperationResult<String> result = create.get();
         assertEquals("/one", result.getResult());
@@ -66,9 +65,10 @@ public class CreateOperationTest extends
         create.setCreateMode(CreateMode.EPHEMERAL_SEQUENTIAL);
 
         OperationResult<String> result = create.get();
-        assertEquals("/three0000000002", result.getResult());
+        String out = result.getResult();
 
-        verifyNodeContainsData("/three0000000002", testPayloadBytes);
+        assertTrue(out.startsWith("/three"));
+        verifyNodeContainsData(out, testPayloadBytes);
     }
 
     @Test