Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1396227 - in /accumulo/branches/1.4/src/core/src:
 main/java/org/apache/accumulo/core/client/mock/
 test/java/org/apache/accumulo/core/client/mock/
Date: Tue, 09 Oct 2012 19:40:43 -0000
To: commits@accumulo.apache.org
From: kturner@apache.org
Message-Id: <20121009194043.BCE5E23889D5@eris.apache.org>

Author: kturner
Date: Tue Oct  9 19:40:42 2012
New Revision: 1396227

URL: http://svn.apache.org/viewvc?rev=1396227&view=rev
Log:
ACCUMULO-782 applied patch from Ed Kohlwey to make mock Accumulo return instance it was created with

Modified:
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java?rev=1396227&r1=1396226&r2=1396227&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java Tue Oct  9 19:40:42 2012
@@ -33,15 +33,17 @@ public class MockConnector extends Conne
   
   String username;
   private final MockAccumulo acu;
+  private final Instance instance;
   
-  MockConnector(String username) {
-    this(username, new MockAccumulo());
+  MockConnector(String username, Instance instance) {
+    this(username, new MockAccumulo(), instance);
   }
   
   @SuppressWarnings("deprecation")
-  MockConnector(String username, MockAccumulo acu) {
+  MockConnector(String username, MockAccumulo acu, Instance instance) {
     this.username = username;
     this.acu = acu;
+    this.instance = instance;
   }
   
   @Override
@@ -75,7 +77,7 @@ public class MockConnector extends Conne
   
   @Override
   public Instance getInstance() {
-    return new MockInstance();
+    return instance;
   }
   
   @Override

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java?rev=1396227&r1=1396226&r2=1396227&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java Tue Oct  9 19:40:42 2012
@@ -87,7 +87,7 @@ public class MockInstance implements Ins
   
   @Override
   public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
-    Connector conn = new MockConnector(user, acu);
+    Connector conn = new MockConnector(user, acu, this);
     conn.securityOperations().createUser(user, pass, new Authorizations());
     return conn;
   }

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java?rev=1396227&r1=1396226&r2=1396227&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Tue Oct  9 19:40:42 2012
@@ -25,11 +25,16 @@ import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.Random;
 
+import junit.framework.Assert;
+
 import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchDeleter;
 import org.apache.accumulo.core.client.BatchScanner;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.MultiTableBatchWriter;
 import org.apache.accumulo.core.client.Scanner;
@@ -52,7 +57,7 @@ public class MockConnectorTest {
   
   @Test
   public void testSunnyDay() throws Exception {
-    Connector c = new MockConnector("root");
+    Connector c = new MockConnector("root", new MockInstance());
     c.tableOperations().create("test");
     BatchWriter bw = c.createBatchWriter("test", 10000L, 1000L, 4);
     for (int i = 0; i < 100; i++) {
@@ -78,7 +83,7 @@ public class MockConnectorTest {
   
   @Test
   public void testChangeAuths() throws Exception {
-    Connector c = new MockConnector("root");
+    Connector c = new MockConnector("root", new MockInstance());
     c.securityOperations().createUser("greg", new byte[] {}, new Authorizations("A", "B", "C"));
     assertTrue(c.securityOperations().getUserAuthorizations("greg").contains("A".getBytes()));
     c.securityOperations().changeUserAuthorizations("greg", new Authorizations("X", "Y", "Z"));
@@ -119,7 +124,7 @@ public class MockConnectorTest {
   
   @Test
   public void testDelete() throws Exception {
-    Connector c = new MockConnector("root");
+    Connector c = new MockConnector("root", new MockInstance());
     c.tableOperations().create("test");
     BatchWriter bw = c.createBatchWriter("test", 10000L, 1000L, 4);
     
@@ -158,7 +163,7 @@ public class MockConnectorTest {
   
   @Test
   public void testDeletewithBatchDeleter() throws Exception {
-    Connector c = new MockConnector("root");
+    Connector c = new MockConnector("root", new MockInstance());
     
     // make sure we are using a clean table
     if (c.tableOperations().exists("test"))
@@ -229,7 +234,7 @@ public class MockConnectorTest {
   @Test
   public void testCMod() throws Exception {
     // test writing to a table that the is being scanned
-    Connector c = new MockConnector("root");
+    Connector c = new MockConnector("root", new MockInstance());
     c.tableOperations().create("test");
     BatchWriter bw = c.createBatchWriter("test", 10000L, 1000L, 4);
     
@@ -280,7 +285,7 @@ public class MockConnectorTest {
   
   @Test
   public void testMockMultiTableBatchWriter() throws Exception {
-    Connector c = new MockConnector("root");
+    Connector c = new MockConnector("root", new MockInstance());
     c.tableOperations().create("a");
     c.tableOperations().create("b");
     MultiTableBatchWriter bw = c.createMultiTableBatchWriter(10000L, 1000L, 4);
@@ -312,7 +317,7 @@ public class MockConnectorTest {
   
   @Test
   public void testUpdate() throws Exception {
-    Connector c = new MockConnector("root");
+    Connector c = new MockConnector("root", new MockInstance());
     c.tableOperations().create("test");
     BatchWriter bw = c.createBatchWriter("test", 1000, 1000l, 1);
     
@@ -331,5 +336,14 @@ public class MockConnectorTest {
     assertEquals("9", entry.getValue().toString());
 
   }
+  
+  @Test
+  public void testMockConnectorReturnsCorrectInstance() throws AccumuloException, 
+      AccumuloSecurityException{
+    String name = "an-interesting-instance-name";
+    Instance mockInstance = new MockInstance(name);
+    Assert.assertEquals(mockInstance, mockInstance.getConnector("foo", "bar").getInstance());
+    Assert.assertEquals(name, mockInstance.getConnector("foo","bar").getInstance().getInstanceName());
+  }
 
 }