Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 90FB37E7F for ; Fri, 25 Nov 2011 13:55:20 +0000 (UTC) Received: (qmail 33695 invoked by uid 500); 25 Nov 2011 13:55:20 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 33664 invoked by uid 500); 25 Nov 2011 13:55:20 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 33657 invoked by uid 99); 25 Nov 2011 13:55:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Nov 2011 13:55:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Nov 2011 13:55:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 35ADC2388860; Fri, 25 Nov 2011 13:54:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1206172 - in /incubator/accumulo/trunk: ./ src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Date: Fri, 25 Nov 2011 13:54:59 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111125135459.35ADC2388860@eris.apache.org> Author: ecn Date: Fri Nov 25 13:54:58 2011 New Revision: 1206172 URL: http://svn.apache.org/viewvc?rev=1206172&view=rev Log: ACCUMULO-172: merge from 1.3 branch Modified: incubator/accumulo/trunk/ (props changed) incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 25 13:54:58 2011 @@ -1,2 +1,2 @@ -/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880 +/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169 /incubator/accumulo/branches/1.4:1201902-1205055 Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java?rev=1206172&r1=1206171&r2=1206172&view=diff ============================================================================== --- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java (original) +++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Fri Nov 25 13:54:58 2011 @@ -40,6 +40,7 @@ import org.apache.accumulo.core.data.Val import org.apache.accumulo.core.iterators.Combiner; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.iterators.user.SummingCombiner; +import org.apache.accumulo.core.security.Authorizations; import org.apache.hadoop.io.Text; import org.junit.Test; @@ -77,6 +78,16 @@ public class MockConnectorTest { } @Test + public void testChangeAuths() throws Exception { + Connector c = new MockConnector("root"); + 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")); + assertTrue(c.securityOperations().getUserAuthorizations("greg").contains("X".getBytes())); + assertFalse(c.securityOperations().getUserAuthorizations("greg").contains("A".getBytes())); + } + + @Test public void testAggregation() throws Exception { MockInstance mockInstance = new MockInstance(); Connector c = mockInstance.getConnector("root", new byte[] {});