HADOOP-15308. TestConfiguration fails on Windows because of paths. Contributed by Xiao Liang.
(cherry picked from commit 427fd027a353f665846f43dfd73faf7561fedc07) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/95a4665a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/95a4665a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/95a4665a Branch: refs/heads/branch-3.0 Commit: 95a4665ad57153ae215c7a09e47453561e43f15b Parents: 9889e55 Author: Inigo Goiri <inigo...@apache.org> Authored: Tue Mar 13 20:01:07 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Tue Mar 13 20:02:06 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/conf/TestConfiguration.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/95a4665a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java index e90b4f0..1ebfa35 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java @@ -57,7 +57,6 @@ import static org.apache.hadoop.conf.StorageUnit.MB; import static org.apache.hadoop.conf.StorageUnit.TB; import static org.hamcrest.core.Is.is; import static org.junit.Assert.*; -import static org.junit.Assert.assertArrayEquals; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration.IntegerRanges; @@ -88,8 +87,8 @@ public class TestConfiguration { final static String CONFIG = new File("./test-config-TestConfiguration.xml").getAbsolutePath(); final static String CONFIG2 = new File("./test-config2-TestConfiguration.xml").getAbsolutePath(); final static String CONFIG_FOR_ENUM = new File("./test-config-enum-TestConfiguration.xml").getAbsolutePath(); - final static String CONFIG_FOR_URI = "file://" - + new File("./test-config-uri-TestConfiguration.xml").getAbsolutePath(); + final static String CONFIG_FOR_URI = new File( + "./test-config-uri-TestConfiguration.xml").toURI().toString(); private static final String CONFIG_MULTI_BYTE = new File( "./test-config-multi-byte-TestConfiguration.xml").getAbsolutePath(); @@ -842,7 +841,8 @@ public class TestConfiguration { out.close(); out=new BufferedWriter(new FileWriter(CONFIG)); writeHeader(); - declareSystemEntity("configuration", "d", CONFIG2); + declareSystemEntity("configuration", "d", + new Path(CONFIG2).toUri().toString()); writeConfiguration(); appendProperty("a", "b"); appendProperty("c", "&d;"); @@ -1714,7 +1714,7 @@ public class TestConfiguration { assertEquals("test.key2", jp1.getKey()); assertEquals("value2", jp1.getValue()); assertEquals(true, jp1.isFinal); - assertEquals(fileResource.toUri().getPath(), jp1.getResource()); + assertEquals(fileResource.toString(), jp1.getResource()); // test xml format outWriter = new StringWriter(); @@ -1725,7 +1725,7 @@ public class TestConfiguration { assertEquals(1, actualConf1.size()); assertEquals("value2", actualConf1.get("test.key2")); assertTrue(actualConf1.getFinalParameters().contains("test.key2")); - assertEquals(fileResource.toUri().getPath(), + assertEquals(fileResource.toString(), actualConf1.getPropertySources("test.key2")[0]); // case 2: dump an non existing property @@ -2236,7 +2236,8 @@ public class TestConfiguration { final File tmpDir = GenericTestUtils.getRandomizedTestDir(); tmpDir.mkdirs(); final String ourUrl = new URI(LocalJavaKeyStoreProvider.SCHEME_NAME, - "file", new File(tmpDir, "test.jks").toString(), null).toString(); + "file", new File(tmpDir, "test.jks").toURI().getPath(), + null).toString(); conf = new Configuration(false); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, ourUrl); @@ -2264,7 +2265,8 @@ public class TestConfiguration { final File tmpDir = GenericTestUtils.getRandomizedTestDir(); tmpDir.mkdirs(); final String ourUrl = new URI(LocalJavaKeyStoreProvider.SCHEME_NAME, - "file", new File(tmpDir, "test.jks").toString(), null).toString(); + "file", new File(tmpDir, "test.jks").toURI().getPath(), + null).toString(); conf = new Configuration(false); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, ourUrl); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
