This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 1fe2ef1c50cc45f476ec7e9e6b3b5211bf0f110b Author: danhaywood <[email protected]> AuthorDate: Wed May 17 20:34:47 2023 +0100 CAUSEWAY-2485 : tooling fixes. --- .../metaprog/demoshowcases/value/ValueTypeGenTemplate.java | 3 ++- .../demoshowcases/value/ValueTypeGenTemplateTest.java | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java index ca1df22a7e..5cde83d2f1 100644 --- a/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java +++ b/tooling/metaprog/src/main/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java @@ -75,7 +75,8 @@ public class ValueTypeGenTemplate { public String getShowcaseValueSimpleType() { String fqt = getShowcaseValueFullyQualifiedType(); int i = fqt.lastIndexOf(","); - return fqt.substring(i+1); + String simpleType = fqt.substring(i + 1); + return simpleType; } } diff --git a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java index 3427eac8f3..e68178f117 100644 --- a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java +++ b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java @@ -61,7 +61,11 @@ class ValueTypeGenTemplateTest { @SneakyThrows void testShowcase(final ValueTypeGenTemplate.Config config) { - val frameWorkRoot = new File(".").getAbsoluteFile().getParentFile().getParentFile().getParentFile(); + var frameWorkRoot = new File(".").getAbsoluteFile().getParentFile().getParentFile().getParentFile(); + + // hack for Dan's PC; write out to a different git worktree + frameWorkRoot = new File(frameWorkRoot.getParentFile(), "demo"); + val demoDomainRoot = new File(frameWorkRoot, "examples/demo/domain/src/main/java"); val demoDomainShowCase = new File(demoDomainRoot, config.getJavaPackage().replace('.', '/')); @@ -78,11 +82,11 @@ class ValueTypeGenTemplateTest { generator.generate(generatedFiles::add); // override origin -// copyFiles(generatedFiles, config.getOutputRootDir(), demoDomainShowCase); -// copyMissingFiles(generatedFiles, config.getOutputRootDir(), demoDomainShowCase); + copyFiles(generatedFiles, config.getOutputRootDir(), demoDomainShowCase); + copyMissingFiles(generatedFiles, config.getOutputRootDir(), demoDomainShowCase); - assertFileSetEquals(refShowcaseFiles, demoDomainShowCase, generatedFiles, config.getOutputRootDir()); - assertFileContentEquals(refShowcaseFiles, generatedFiles); +// assertFileSetEquals(refShowcaseFiles, demoDomainShowCase, generatedFiles, config.getOutputRootDir()); +// assertFileContentEquals(refShowcaseFiles, generatedFiles); }
