You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by km...@apache.org on 2016/12/23 21:10:06 UTC
[13/25] geode git commit: GEODE-2167: fix
BundledJarsJUnitTest.verifyBundledJarsHaveNotChanged on Windows
GEODE-2167: fix BundledJarsJUnitTest.verifyBundledJarsHaveNotChanged on Windows
expectedJarFile path should be set on Windows properly.
* reworded commit message [klund]
* this closes #308 [klund]
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/31ee3388
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/31ee3388
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/31ee3388
Branch: refs/heads/feature/GEODE-2231
Commit: 31ee33882d6bf2a15201e1e7bdf9eecda1fdc16b
Parents: ca211b7
Author: Kai Jiang <ji...@gmail.com>
Authored: Fri Dec 9 01:32:11 2016 -0800
Committer: Karen Miller <km...@pivotal.io>
Committed: Fri Dec 23 13:09:28 2016 -0800
----------------------------------------------------------------------
geode-assembly/.gitignore | 1 +
.../src/test/java/org/apache/geode/util/test/TestUtil.java | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/31ee3388/geode-assembly/.gitignore
----------------------------------------------------------------------
diff --git a/geode-assembly/.gitignore b/geode-assembly/.gitignore
new file mode 100644
index 0000000..fb03fbe
--- /dev/null
+++ b/geode-assembly/.gitignore
@@ -0,0 +1 @@
+bundled_jars.txt
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/31ee3388/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java b/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
index abc51ef..927008b 100644
--- a/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
@@ -19,6 +19,7 @@ import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
+import org.apache.commons.lang.SystemUtils;
import org.apache.geode.internal.FileUtil;
public class TestUtil {
@@ -46,11 +47,15 @@ public class TestUtil {
File tmpFile = File.createTempFile(filename, null);
tmpFile.deleteOnExit();
FileUtil.copy(resource, tmpFile);
- return tmpFile.getAbsolutePath();
+ return compatibleWithWindows(tmpFile.getAbsolutePath());
}
- return path;
+ return compatibleWithWindows(path);
} catch (URISyntaxException | IOException e) {
throw new RuntimeException("Failed getting path to resource " + name, e);
}
}
+
+ private static String compatibleWithWindows(String path) {
+ return SystemUtils.IS_OS_WINDOWS ? path.substring(1) : path;
+ }
}