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/01/27 14:50:37 UTC

[cayenne] branch STABLE-4.1 updated: CAY-2646 Wrong target path selection logic in cgen config - fix test

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/STABLE-4.1 by this push:
     new 67486a6  CAY-2646 Wrong target path selection logic in cgen config   - fix test
67486a6 is described below

commit 67486a646e6d9159237ad39c0b926c5ad7fc673e
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Mon Jan 27 17:48:42 2020 +0300

    CAY-2646 Wrong target path selection logic in cgen config
      - fix test
    
    (cherry picked from commit af1a42daca29af11addb34bbabf217552093ae10)
---
 .../test/java/org/apache/cayenne/gen/xml/CgenSaverDelegateTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 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 9158d73..41dd931 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
@@ -41,7 +41,7 @@ public class CgenSaverDelegateTest {
 
         CgenSaverDelegate.resolveOutputDir(baseURL, config);
 
-        assertEquals(Paths.get("/tmp/src/main/java"), config.getRootPath());
+        assertEquals(Paths.get("/tmp/src/main/resources"), config.getRootPath());
         assertEquals(Paths.get("../java"), config.getRelPath());
     }
 
@@ -56,7 +56,7 @@ public class CgenSaverDelegateTest {
 
         CgenSaverDelegate.resolveOutputDir(baseURL, config);
 
-        assertEquals(Paths.get("/tmp/src/main/java"), config.getRootPath());
+        assertEquals(Paths.get("/tmp/src/main/resources"), config.getRootPath());
         assertEquals(Paths.get("../java"), config.getRelPath());
     }