You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2011/12/05 22:13:29 UTC

svn commit: r1210639 - in /incubator/accumulo/trunk: ./ src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java

Author: billie
Date: Mon Dec  5 21:13:29 2011
New Revision: 1210639

URL: http://svn.apache.org/viewvc?rev=1210639&view=rev
Log:
ACCUMULO-200 merged to trunk

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  5 21:13:29 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,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1210571
-/incubator/accumulo/branches/1.4:1201902-1209288,1209528,1209531,1209535,1209546,1210628
+/incubator/accumulo/branches/1.4:1201902-1209288,1209528,1209531,1209535,1209546,1210591,1210628

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java?rev=1210639&r1=1210638&r2=1210639&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java Mon Dec  5 21:13:29 2011
@@ -251,7 +251,12 @@ public class TableOperationsHelperTest {
       Assert.fail();
     } catch (IllegalArgumentException e) {}
     setting.setPriority(10);
+    t.setProperty("table", "table.iterator.minc.thirdName.opt.key", "value");
+    try {
+      t.attachIterator("table", setting);
+      Assert.fail();
+    } catch (IllegalArgumentException e) {}
+    t.removeProperty("table", "table.iterator.minc.thirdName.opt.key");
     t.attachIterator("table", setting);
   }
-  
 }