You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dr...@apache.org on 2016/09/13 08:30:03 UTC
[49/50] [abbrv] hadoop git commit: HDFS-10657. testAclCLI.xml setfacl
test should expect mask r-x. (John Zhuge via Yongjun Zhang)
HDFS-10657. testAclCLI.xml setfacl test should expect mask r-x. (John Zhuge via Yongjun Zhang)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d2466ec3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d2466ec3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d2466ec3
Branch: refs/heads/HDFS-10285
Commit: d2466ec3e01b5ef2a0bde738232c5ad6d2d956eb
Parents: 72dfb04
Author: Yongjun Zhang <yz...@cloudera.com>
Authored: Mon Sep 12 21:25:06 2016 -0700
Committer: Yongjun Zhang <yz...@cloudera.com>
Committed: Mon Sep 12 21:25:06 2016 -0700
----------------------------------------------------------------------
.../hadoop/cli/util/ExactLineComparator.java | 44 ++++++++++++++++++++
.../src/test/resources/testAclCLI.xml | 34 +++++++--------
2 files changed, 61 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2466ec3/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/ExactLineComparator.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/ExactLineComparator.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/ExactLineComparator.java
new file mode 100644
index 0000000..994be7b
--- /dev/null
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/cli/util/ExactLineComparator.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.cli.util;
+
+import java.util.StringTokenizer;
+
+/**
+ * Comparator for the Command line tests.
+ *
+ * This comparator searches for an exact line as 'expected'
+ * in the string 'actual' and returns true if found
+ *
+ */
+public class ExactLineComparator extends ComparatorBase {
+
+ @Override
+ public boolean compare(String actual, String expected) {
+ boolean success = false;
+ StringTokenizer tokenizer = new StringTokenizer(actual, "\n\r");
+ while (tokenizer.hasMoreTokens() && !success) {
+ String actualToken = tokenizer.nextToken();
+ success = actualToken.equals(expected);
+ }
+
+ return success;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2466ec3/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
index 82a5809..7d9ecf8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
@@ -679,63 +679,63 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output># file: /dir1/dir2</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output># owner: USERNAME</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output># group: supergroup</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>user::rwx</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>user:charlie:r-x</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>group::r-x</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
- <expected-output>group:admin:rwx</expected-output>
+ <type>RegexpComparator</type>
+ <expected-output>^group:admin:rwx\b.*</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
- <expected-output>mask::rwx</expected-output>
+ <type>ExactLineComparator</type>
+ <expected-output>mask::r-x</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>default:user::rwx</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>default:user:charlie:r-x</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>default:group::r-x</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>default:group:admin:rwx</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>default:mask::rwx</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>default:other::r-x</expected-output>
</comparator>
<comparator>
- <type>SubstringComparator</type>
+ <type>ExactLineComparator</type>
<expected-output>other::r-x</expected-output>
</comparator>
</comparators>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org