svn commit: r1502343 - in /accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional: DeleteIT.java MacTest.java SplitIT.java

[ec...@apache.org]

Author: ecn
Date: Thu Jul 11 20:07:34 2013
New Revision: 1502343

URL: http://svn.apache.org/r1502343
Log:
ACCUMULO-1537 fix static cluster/folder in MacTest

Modified:
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java?rev=1502343&r1=1502342&r2=1502343&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java Thu Jul 11 20:07:34 2013
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEqu
 
 import org.apache.accumulo.core.cli.ScannerOpts;
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
 import org.apache.accumulo.server.util.Admin;
 import org.apache.accumulo.test.TestIngest;
 import org.apache.accumulo.test.TestRandomDeletes;
@@ -32,11 +33,11 @@ public class DeleteIT extends MacTest {
   public void test() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
-    deleteTest(c);
+    deleteTest(c, cluster);
     assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
   }
 
-  public static void deleteTest(Connector c) throws Exception {
+  public static void deleteTest(Connector c, MiniAccumuloCluster cluster) throws Exception {
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     TestIngest.Opts opts = new TestIngest.Opts();
     vopts.rows = opts.rows = 1000;

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java?rev=1502343&r1=1502342&r2=1502343&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MacTest.java Thu Jul 11 20:07:34 2013
@@ -31,11 +31,11 @@ import org.junit.rules.TemporaryFolder;
 
 public class MacTest {
   public static final Logger log = Logger.getLogger(MacTest.class);
-  public static TemporaryFolder folder = new TemporaryFolder();
-  public static MiniAccumuloCluster cluster;
   public static final String PASSWORD = "secret";
   static final ScannerOpts SOPTS = new ScannerOpts();
   static final BatchWriterOpts BWOPTS = new BatchWriterOpts();
+  public TemporaryFolder folder = new TemporaryFolder();
+  public MiniAccumuloCluster cluster;
   
   public Connector getConnector() throws AccumuloException, AccumuloSecurityException {
     return cluster.getConnector("root", PASSWORD);

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java?rev=1502343&r1=1502342&r2=1502343&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java Thu Jul 11 20:07:34 2013
@@ -101,7 +101,7 @@ public class SplitIT extends MacTest {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
     c.tableOperations().setProperty("test_ingest", Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K");
-    DeleteIT.deleteTest(c);
+    DeleteIT.deleteTest(c, cluster);
     c.tableOperations().flush("test_ingest", null, null, true);
     UtilWaitThread.sleep(10*1000);
     assertTrue(c.tableOperations().listSplits("test_ingest").size() > 30);