Repository: maven-archetype Updated Branches: refs/heads/master e9078f97b -> 6b0b51c06
[ARCHETYPE-494] don't hardcode outputDirectory Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/6b0b51c0 Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/6b0b51c0 Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/6b0b51c0 Branch: refs/heads/master Commit: 6b0b51c06e98284d245275b2cbf39df4db16e2e5 Parents: e9078f9 Author: Hervé Boutemy <hbout...@apache.org> Authored: Sat Jan 16 18:51:01 2016 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Sat Jan 16 18:51:01 2016 +0100 ---------------------------------------------------------------------- .../META-INF/archetype-post-generate.groovy | 9 ++++++--- .../generator/DefaultArchetypeGeneratorTest.java | 2 +- .../DefaultRepositoryCrawlerTest.java | 17 +++-------------- 3 files changed, 10 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/6b0b51c0/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy ---------------------------------------------------------------------- diff --git a/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy b/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy index d60d13a..76edbee 100644 --- a/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy +++ b/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy @@ -1,6 +1,9 @@ println "Executing the archetype-post-generate.groovy script..."; -def projectFolder = this.'user.dir' + this.'file.separator' + "target/test-classes/projects" + this.'file.separator' + "generate-13" + this.'file.separator' + "file-value" + this.'file.separator'; +def outputDirectory = new File( request.getOutputDirectory() ); -println "Removing file: ${projectFolder}src/main/java/file/value/package/ToDelete.java"; -new File(projectFolder + "src/main/java/file/value/package/ToDelete.java").delete(); +// TODO: file-value and file/value/package should be calculated +def toDelete = new File( outputDirectory, "file-value/src/main/java/file/value/package/ToDelete.java" ); + +println "Removing file: " + toDelete; +assert toDelete.delete(); http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/6b0b51c0/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java ---------------------------------------------------------------------- diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java index c74f8ea..f901be6 100644 --- a/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java +++ b/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java @@ -445,7 +445,7 @@ public class DefaultArchetypeGeneratorTest assertTemplateCopiedWithFileSetArchetype( "src/main/java/file/value/package/App.ogg" ); File templateFile = new File( projectDirectory, "src/main/java/file/value/package/ToDelete.java" ); - assertFalse( templateFile.exists() ); + assertFalse( templateFile + " should have been removed (by post-generate.groovy script", templateFile.exists() ); assertTemplateContentGeneratedWithFileSetArchetype( "src/main/resources/App.properties", "file-value" ); assertTemplateContentGeneratedWithFileSetArchetype( "src/main/resources/file-value/touch.txt", "file-value" ); http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/6b0b51c0/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java ---------------------------------------------------------------------- diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java index 60e259a..9782dcf 100644 --- a/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java +++ b/archetype-common/src/test/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawlerTest.java @@ -42,8 +42,9 @@ public class DefaultRepositoryCrawlerTest RepositoryCrawler instance = (RepositoryCrawler) lookup( RepositoryCrawler.class.getName() ); ArchetypeCatalog result = instance.crawl( repository ); - System.err.println( "result = " + result ); - assertTrue( ( 5 <= result.getArchetypes().size() ) && ( result.getArchetypes().size() <= 8 ) ); + assertTrue( "result.getArchetypes().size() = " + result.getArchetypes().size() + + " should be in [5,8], result = " + result, + ( 5 <= result.getArchetypes().size() ) && ( result.getArchetypes().size() <= 8 ) ); // TODO: should write to another directory // instance.writeCatalog(result, new File(repository, "archetype-catalog.xml")); @@ -66,16 +67,4 @@ public class DefaultRepositoryCrawlerTest // // TODO review the generated test code and remove the default call to fail. //// fail ( "The test case is a prototype." ); // } - - protected void tearDown() - throws Exception - { - super.tearDown(); - } - - protected void setUp() - throws Exception - { - super.setUp(); - } }
