motiejus
/
jgit
1
Fork 0
Code Releases Activity

ConfigTest: Move pathToString to FileUtils 

ConfigTest#pathToString is not visible to FileBasedConfigTest when
bulding with bazel.

Move it to FileUtils rather than messing about with the bazel build
rules to make it visible.

Change-Id: Idcfd4822699dac9dc4a426088a929a9cd31bf53f
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2017-12-05 10:37:26 +09:00
parent 26d78902f8
commit df3a7c32a4
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
View File

@ -53,6 +53,7 @@
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.eclipse.jgit.util.FileUtils.pathToString;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -855,14 +856,6 @@ public void testInclude() throws IOException, ConfigInvalidException {
assertEquals("bar", parsed.getString("other", null, "more"));
}
public static String pathToString(File file) {
final String path = file.getPath();
if (SystemReader.getInstance().isWindows()) {
return path.replace('\\', '/');
}
return path;
}
private static void assertReadLong(long exp) throws ConfigInvalidException {
assertReadLong(exp, String.valueOf(exp));
}

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileBasedConfigTest.java
View File

@ -42,6 +42,7 @@
*/
package org.eclipse.jgit.storage.file;
import static org.eclipse.jgit.util.FileUtils.pathToString;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@ -52,7 +53,6 @@
import java.io.IOException;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.ConfigTest;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.util.IO;
@ -164,7 +164,7 @@ public void testIncludeAbsolute()
final File includedFile = createFile(CONTENT1.getBytes());
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
bos.write("[include]\npath=".getBytes());
bos.write(ConfigTest.pathToString(includedFile).getBytes());
bos.write(pathToString(includedFile).getBytes());
final File file = createFile(bos.toByteArray());
final FileBasedConfig config = new FileBasedConfig(file, FS.DETECTED);

14
org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java
View File

@ -869,4 +869,18 @@ public static File canonicalize(File file) {
}
}
/**
* Convert a path to String, replacing separators as necessary.
*
* @param file
* @return file's path as a String
* @since 4.10
*/
public static String pathToString(File file) {
final String path = file.getPath();
if (SystemReader.getInstance().isWindows()) {
return path.replace('\\', '/');
}
return path;
}
}