Author: khmarbaise
Date: Thu Oct 1 17:39:35 2015
New Revision: 1706297
URL: http://svn.apache.org/viewvc?rev=1706297&view=rev
Log:
Changed from deprecated method File.toURL() into File.toURI().toURL()
which results in changing a unit test which formerly did not expect
having escaped characters but now it works like this.
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java?rev=1706297&r1=1706296&r2=1706297&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
Thu Oct 1 17:39:35 2015
@@ -692,9 +692,7 @@ public class FileUtils
for ( int i = 0; i < urls.length; i++ )
{
- // Although this method is deprecated, it is still the most solid
way to translate a File to URL
- //noinspection deprecation
- urls[i] = files[i].toURL();
+ urls[i] = files[i].toURI().toURL();
}
return urls;
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java?rev=1706297&r1=1706296&r2=1706297&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
Thu Oct 1 17:39:35 2015
@@ -246,7 +246,7 @@ public class FileUtilsTest
// Test escaped char
assertThat( urls[2].toExternalForm().startsWith( "file:" ), is( true )
);
- assertThat( urls[2].toExternalForm(), not( containsString(
"test%20file.txt" ) ) );
+ assertThat( urls[2].toExternalForm(), containsString(
"test%20file.txt" ) );
}
// @Test public void toURLs2() throws Exception {