ACCUMULO-802 fixed tests to work correctly for cloning namespaces
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7b1833f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7b1833f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7b1833f Branch: refs/heads/ACCUMULO-802 Commit: e7b1833fdd4b807dce5c5c19ebffac2b731ea13d Parents: b845a04 Author: Sean Hickey <tallirishll...@gmail.com> Authored: Mon Jul 29 11:34:52 2013 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Oct 31 21:26:22 2013 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/ShellServerIT.java | 14 +++++++------- .../org/apache/accumulo/test/TableNamespacesIT.java | 7 +++++-- 2 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7b1833f/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 8fdaefc..c97db43 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@ -856,13 +856,13 @@ public class ShellServerIT extends SimpleMacIT { exec("online -tn thing2", true); exec("flush -tn thing2", true); exec("compact -tn thing2", true); - exec("createnamespace testers", true); - exec("createtable testers.1", true); - exec("createtable testers.2", true); - exec("deletetable -tn testers -f", true); - exec("tables", true, "testers.1", false); - exec("namespaces", true, "testers", true); - exec("deletenamespace testers -f", true); + exec("createnamespace testers3", true); + exec("createtable testers3.1", true); + exec("createtable testers3.2", true); + exec("deletetable -tn testers3 -f", true); + exec("tables", true, "testers3.1", false); + exec("namespaces", true, "testers3", true); + exec("deletenamespace testers3 -f", true); // properties override and such exec("config -tn thing2 -s table.file.max=44444", true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7b1833f/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java b/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java index edc5422..c52b844 100644 --- a/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/TableNamespacesIT.java @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Random; +import java.util.Set; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.AccumuloException; @@ -348,11 +349,13 @@ public class TableNamespacesIT { Map<String,String> propsToSet = new HashMap<String,String>(); propsToSet.put(propKey1, propVal1); - c.tableNamespaceOperations().clone(n1, n3, true, propsToSet, null, true); + Set<String> propsToExclude = new HashSet<String>(); + propsToExclude.add(propKey2); + c.tableNamespaceOperations().clone(n1, n3, true, propsToSet, propsToExclude, true); assertTrue(checkTableNamespaceHasProp(c, n3, propKey1, propVal1)); assertTrue(checkTableHasProp(c, n3 + t, propKey1, propVal2)); - assertTrue(checkTableNamespaceHasProp(c, n3, propKey2, propVal3)); + assertTrue(!checkTableNamespaceHasProp(c, n3, propKey2, propVal3)); assertTrue(!checkTableHasProp(c, n3 + t, propKey2, propVal3)); }
