You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2020/06/08 14:46:03 UTC
[cayenne] branch master updated: Fix tests on Windows
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new c2845b1 Fix tests on Windows
c2845b1 is described below
commit c2845b16d62db4c8e0cbfb59666906e97b72b7be
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Mon Jun 8 17:45:01 2020 +0300
Fix tests on Windows
---
.../java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java
index 41dd931..37c910b 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java
@@ -36,12 +36,12 @@ public class CgenSaverDelegateTest {
public void testExistingRootOverride() throws Exception {
CgenConfiguration config = new CgenConfiguration(false);
- config.setRootPath(Paths.get("/tmp/src/main/java"));
+ config.setRootPath(Paths.get("/tmp/src/main/java").toAbsolutePath());
URL baseURL = Paths.get("/tmp/src/main/resources").toUri().toURL();
CgenSaverDelegate.resolveOutputDir(baseURL, config);
- assertEquals(Paths.get("/tmp/src/main/resources"), config.getRootPath());
+ assertEquals(Paths.get("/tmp/src/main/resources").toAbsolutePath(), config.getRootPath());
assertEquals(Paths.get("../java"), config.getRelPath());
}
@@ -49,14 +49,14 @@ public class CgenSaverDelegateTest {
public void testExistingRootAndRelPath() throws Exception {
CgenConfiguration config = new CgenConfiguration(false);
- config.setRootPath(Paths.get("/tmp/src/main/java"));
+ config.setRootPath(Paths.get("/tmp/src/main/java").toAbsolutePath());
config.setRelPath(Paths.get(""));
URL baseURL = Paths.get("/tmp/src/main/resources").toUri().toURL();
CgenSaverDelegate.resolveOutputDir(baseURL, config);
- assertEquals(Paths.get("/tmp/src/main/resources"), config.getRootPath());
+ assertEquals(Paths.get("/tmp/src/main/resources").toAbsolutePath(), config.getRootPath());
assertEquals(Paths.get("../java"), config.getRelPath());
}
@@ -68,7 +68,7 @@ public class CgenSaverDelegateTest {
CgenSaverDelegate.resolveOutputDir(baseURL, config);
- assertEquals(Paths.get("/tmp/src/main/resources"), config.getRootPath());
+ assertEquals(Paths.get("/tmp/src/main/resources").toAbsolutePath(), config.getRootPath());
assertEquals(Paths.get(""), config.getRelPath());
}