ACCUMULO-804 applied fixes to changes that broke compilation against hadoop 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431056 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 42cca8a3c910ec4d813b7611b2e65e70e57c6d66) Reason: Hadoop2 compat Author: Billie Rinaldi <bil...@apache.org> Ref: ACCUMULO-1792 Signed-off-by: Eric Newton <eric.new...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec2aaa6a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec2aaa6a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec2aaa6a Branch: refs/heads/1.4.5-SNAPSHOT Commit: ec2aaa6aff59fa65593641bf03b719a3147f3791 Parents: fc3fdf3 Author: Jonathan M Hsieh <j...@cloudera.com> Authored: Wed May 29 13:16:18 2013 -0700 Committer: Eric Newton <eric.new...@gmail.com> Committed: Mon Nov 25 16:06:42 2013 -0500 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/core/conf/PropertyTest.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec2aaa6a/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java ---------------------------------------------------------------------- diff --git a/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java b/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java index f929921..551d042 100644 --- a/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java +++ b/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java @@ -92,5 +92,11 @@ public class PropertyTest { typeCheckValidFormat(PropertyType.HOSTLIST, "localhost", "server1,server2,server3", "server1:1111,server2:3333", "localhost:1111", "server2:1111", "www.server", "www.server:1111", "www.server.com", "www.server.com:111"); typeCheckInvalidFormat(PropertyType.HOSTLIST, ":111", "local host"); + + typeCheckValidFormat(PropertyType.ABSOLUTEPATH, "/foo", "/foo/c", "/"); + // in hadoop 2.0 Path only normalizes Windows paths properly when run on a Windows system + // this makes the following checks fail + // typeCheckValidFormat(PropertyType.ABSOLUTEPATH, "d:\\foo12", "c:\\foo\\g", "c:\\foo\\c", "c:\\"); + typeCheckInvalidFormat(PropertyType.ABSOLUTEPATH, "foo12", "foo/g", "foo\\c"); } }
