Author: cschneider
Date: Tue Dec 11 15:42:31 2012
New Revision: 1420230
URL: http://svn.apache.org/viewvc?rev=1420230&view=rev
Log:
Fix for test on mac
Modified:
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ZookeeperStarterTest.java
Modified:
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ZookeeperStarterTest.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ZookeeperStarterTest.java?rev=1420230&r1=1420229&r2=1420230&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ZookeeperStarterTest.java
(original)
+++
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ZookeeperStarterTest.java
Tue Dec 11 15:42:31 2012
@@ -35,7 +35,7 @@ import org.osgi.framework.BundleContext;
public class ZookeeperStarterTest extends TestCase {
public void testUpdateConfig() throws Exception {
- final File tempDir = new File(System.getProperty("java.io.tmpdir"));
+ final File tempDir = new File("target");
IMocksControl control = EasyMock.createControl();
BundleContext bc = control.createMock(BundleContext.class);
expect(bc.getDataFile("")).andReturn(tempDir);
@@ -47,7 +47,7 @@ public class ZookeeperStarterTest extend
@Override
protected void startFromConfig(QuorumPeerConfig config) throws
IOException, InterruptedException {
assertEquals(1234, config.getClientPortAddress().getPort());
- assertEquals(tempDir + File.separator + "zkdata",
config.getDataDir());
+ assertTrue(config.getDataDir().contains(tempDir +
File.separator + "zkdata"));
assertEquals(2000, config.getTickTime());
assertEquals(10, config.getInitLimit());
assertEquals(5, config.getSyncLimit());