[Bigdata-commit] SF.net SVN: bigdata:[4124] branches/QUADS_QUERY_BRANCH

[<tho...@us...>]

Revision: 4124
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4124&view=rev
Author:   thompsonbry
Date:     2011-01-18 21:50:42 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
Put the parameterized clientPort and tickTime into the environment when running junit.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/jini/start/AbstractFedZooTestCase.java
    branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/jini/start/DestroyTransactionService.java
    branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/zookeeper/AbstractZooTestCase.java
    branches/QUADS_QUERY_BRANCH/build.xml

Modified: branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/jini/start/AbstractFedZooTestCase.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/jini/start/AbstractFedZooTestCase.java	2011-01-18 20:24:39 UTC (rev 4123)
+++ branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/jini/start/AbstractFedZooTestCase.java	2011-01-18 21:50:42 UTC (rev 4124)
@@ -86,13 +86,13 @@
     // ACL used for the unit tests.
     protected final List<ACL> acl = Ids.OPEN_ACL_UNSAFE;
 
-    Configuration config;
+    protected Configuration config;
 
     final protected MockListener listener = new MockListener();
 
-    JiniFederation fed;
+    protected JiniFederation<?> fed;
 
-    String zrootname = null;
+    protected String zrootname = null;
     
     public void setUp() throws Exception {
 

Modified: branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/jini/start/DestroyTransactionService.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/jini/start/DestroyTransactionService.java	2011-01-18 20:24:39 UTC (rev 4123)
+++ branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/jini/start/DestroyTransactionService.java	2011-01-18 21:50:42 UTC (rev 4124)
@@ -56,11 +56,11 @@
     public static void main(String[] args) throws InterruptedException,
             RemoteException {
 
-        JiniFederation fed = JiniClient.newInstance(args).connect();
+        final JiniFederation<?> fed = JiniClient.newInstance(args).connect();
 
         try {
 
-            IService service = fed.getTransactionService();
+            final IService service = fed.getTransactionService();
 
             if (service == null) {
 

Modified: branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/zookeeper/AbstractZooTestCase.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/zookeeper/AbstractZooTestCase.java	2011-01-18 20:24:39 UTC (rev 4123)
+++ branches/QUADS_QUERY_BRANCH/bigdata-jini/src/test/com/bigdata/zookeeper/AbstractZooTestCase.java	2011-01-18 21:50:42 UTC (rev 4124)
@@ -27,21 +27,17 @@
 
 package com.bigdata.zookeeper;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.BindException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
 import junit.framework.TestCase2;
-import net.jini.config.Configuration;
-import net.jini.config.ConfigurationProvider;
 
 import org.apache.log4j.Level;
 import org.apache.zookeeper.CreateMode;
@@ -53,14 +49,9 @@
 import org.apache.zookeeper.KeeperException.SessionExpiredException;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.server.quorum.QuorumPeerMain;
 
 import com.bigdata.jini.start.MockListener;
-import com.bigdata.jini.start.config.ZookeeperServerConfiguration;
 import com.bigdata.jini.start.process.ProcessHelper;
-import com.bigdata.jini.start.process.ZookeeperProcessHelper;
-import com.bigdata.jini.util.ConfigMath;
-import com.bigdata.resources.ResourceFileFilter;
 import com.bigdata.util.config.NicUtil;
 
 /**
@@ -150,7 +141,7 @@
 //    private File dataDir = null;
     
     // the chosen client port.
-    int clientPort = -1;
+    protected int clientPort = -1;
     
     public void setUp() throws Exception {
 

Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml	2011-01-18 20:24:39 UTC (rev 4123)
+++ branches/QUADS_QUERY_BRANCH/build.xml	2011-01-18 21:50:42 UTC (rev 4124)
@@ -1846,6 +1846,9 @@
         <sysproperty key="app.home" value="${app.home}" />
         <sysproperty key="default.nic" value="${default.nic}" />
 
+        <sysproperty key="test.zookeeper.clientPort" value="${test.zookeeper.clientPort}" />
+        <sysproperty key="test.zookeeper.tickTime" value="${test.zookeeper.tickTime}" />
+
         <sysproperty key="classserver.jar" value="${dist.lib}/classserver.jar" />
         <sysproperty key="colt.jar" value="${dist.lib}/colt.jar" />
         <sysproperty key="cweb-commons.jar" value="${dist.lib}/cweb-commons.jar" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.