Author: tchemit Date: 2010-04-07 12:21:25 +0200 (Wed, 07 Apr 2010) New Revision: 1718 Log: add skeleton integration test + improve test Added: trunk/src/it/settings.xml trunk/src/it/update-header-file/LICENSE.txt trunk/src/it/update-header-file/README.txt trunk/src/it/update-header-file/changelog.txt trunk/src/it/update-header-file/invoker.properties trunk/src/it/update-header-file/pom.xml trunk/src/it/update-header-file/src/ trunk/src/it/update-header-file/src/license/ trunk/src/it/update-header-file/src/license/project.xml trunk/src/it/update-header-file/src/main/ trunk/src/it/update-header-file/src/main/java/ trunk/src/it/update-header-file/src/main/java/org/ trunk/src/it/update-header-file/src/main/java/org/nuiton/ trunk/src/it/update-header-file/src/main/java/org/nuiton/license/ trunk/src/it/update-header-file/src/main/java/org/nuiton/license/plugin/ trunk/src/it/update-header-file/src/main/java/org/nuiton/license/plugin/test/ trunk/src/it/update-header-file/src/main/java/org/nuiton/license/plugin/test/MyBean.java trunk/src/it/update-header-file/verify.groovy Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderFileMojo.java trunk/src/main/java/org/nuiton/license/plugin/model/License.java trunk/src/main/java/org/nuiton/license/plugin/model/LicenseRepository.java trunk/src/main/java/org/nuiton/license/plugin/model/LicenseStore.java trunk/src/test/java/org/nuiton/license/plugin/AddLicenseFileMojoTest.java trunk/src/test/java/org/nuiton/license/plugin/model/LicenseRepositoryTest.java trunk/src/test/java/org/nuiton/license/plugin/model/LicenseStoreTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-06 21:35:23 UTC (rev 1717) +++ trunk/pom.xml 2010-04-07 10:21:25 UTC (rev 1718) @@ -446,9 +446,10 @@ <profiles> - <!--profile> + <profile> <id>run-its</id> <build> + <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> <artifactId>maven-invoker-plugin</artifactId> @@ -460,6 +461,7 @@ <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <!--<debug>true</debug>--> </configuration> <executions> <execution> @@ -474,7 +476,7 @@ </plugin> </plugins> </build> - </profile--> + </profile> </profiles> Added: trunk/src/it/settings.xml =================================================================== --- trunk/src/it/settings.xml (rev 0) +++ trunk/src/it/settings.xml 2010-04-07 10:21:25 UTC (rev 1718) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<settings> + + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> +</settings> Added: trunk/src/it/update-header-file/LICENSE.txt =================================================================== --- trunk/src/it/update-header-file/LICENSE.txt (rev 0) +++ trunk/src/it/update-header-file/LICENSE.txt 2010-04-07 10:21:25 UTC (rev 1718) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/src/it/update-header-file/README.txt =================================================================== --- trunk/src/it/update-header-file/README.txt (rev 0) +++ trunk/src/it/update-header-file/README.txt 2010-04-07 10:21:25 UTC (rev 1718) @@ -0,0 +1,2 @@ +To test parserJava on a new project (says a project with no i18n translations) +At the end we should have in target/generated-sources/i18n getters detected. Added: trunk/src/it/update-header-file/changelog.txt =================================================================== --- trunk/src/it/update-header-file/changelog.txt (rev 0) +++ trunk/src/it/update-header-file/changelog.txt 2010-04-07 10:21:25 UTC (rev 1718) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file Added: trunk/src/it/update-header-file/invoker.properties =================================================================== --- trunk/src/it/update-header-file/invoker.properties (rev 0) +++ trunk/src/it/update-header-file/invoker.properties 2010-04-07 10:21:25 UTC (rev 1718) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean compile + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Added: trunk/src/it/update-header-file/pom.xml =================================================================== --- trunk/src/it/update-header-file/pom.xml (rev 0) +++ trunk/src/it/update-header-file/pom.xml 2010-04-07 10:21:25 UTC (rev 1718) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <groupId>org.nuiton.license.test</groupId> + <artifactId>test-update-header-file</artifactId> + <version>@pom.version@</version> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>License Test :: update-header-file</name> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <id>first</id> + <goals> + <goal>update-header-file</goal> + </goals> + <phase>process-sources</phase> + </execution> + <execution> + <!-- this execution is to test with no files --> + <id>second</id> + <goals> + <goal>update-header-file</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + + Added: trunk/src/it/update-header-file/src/license/project.xml =================================================================== --- trunk/src/it/update-header-file/src/license/project.xml (rev 0) +++ trunk/src/it/update-header-file/src/license/project.xml 2010-04-07 10:21:25 UTC (rev 1718) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProject-1.0.0.xsd"> + <mainLicense>gpl_v3</mainLicense> + <licenseSets> + <licenseSet> + <licenseName>gpl_v3</licenseName> + <fileSets> + <fileSet> + <headerType>license-java</headerType> + <basedir>src/main/java</basedir> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + </fileSets> + </licenseSet> + </licenseSets> +</project> Added: trunk/src/it/update-header-file/src/main/java/org/nuiton/license/plugin/test/MyBean.java =================================================================== --- trunk/src/it/update-header-file/src/main/java/org/nuiton/license/plugin/test/MyBean.java (rev 0) +++ trunk/src/it/update-header-file/src/main/java/org/nuiton/license/plugin/test/MyBean.java 2010-04-07 10:21:25 UTC (rev 1718) @@ -0,0 +1,4 @@ +package org.nuiton.license.plugin.test; + +public class MyBean { +} Property changes on: trunk/src/it/update-header-file/src/main/java/org/nuiton/license/plugin/test/MyBean.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/src/it/update-header-file/verify.groovy =================================================================== --- trunk/src/it/update-header-file/verify.groovy (rev 0) +++ trunk/src/it/update-header-file/verify.groovy 2010-04-07 10:21:25 UTC (rev 1718) @@ -0,0 +1,8 @@ + +file = new File(basedir, 'src/main/java/org/nuiton/license/plugin/test/MyBean.java'); +assert file.exists(); + +content = file.text; +//assert content.contains( 'Copyright' ); + +return true; Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java 2010-04-06 21:35:23 UTC (rev 1717) +++ trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java 2010-04-07 10:21:25 UTC (rev 1718) @@ -77,7 +77,10 @@ store.addJarRepository(); if (extraResolver != null) { for (String s : extraResolver) { - store.addRepository(s); + if (s != null && !s.trim().isEmpty()) { + getLog().info("adding extra resolver " + s); + store.addRepository(s); + } } } store.init(); Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderFileMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderFileMojo.java 2010-04-06 21:35:23 UTC (rev 1717) +++ trunk/src/main/java/org/nuiton/license/plugin/UpdateHeaderFileMojo.java 2010-04-07 10:21:25 UTC (rev 1718) @@ -15,7 +15,6 @@ import java.util.List; import java.util.Map; - /** * The goal to update (or add) the licence header on some files. * <p/> @@ -69,14 +68,14 @@ */ protected String projectName; - /** - * Le type de license a appliquer. - * - * @parameter expression="${license.licenseName}" - * @required - * @since 2.1 - */ - protected String licenseName; +// /** +// * Le type de license a appliquer. +// * +// * @parameter expression="${license.licenseName}" +// * @required +// * @since 2.1 +// */ +// protected String licenseName; /** * To specify an external licenses repository resolver (says the base url @@ -193,9 +192,9 @@ return projectName; } - public String getLicenseName() { - return licenseName; - } +// public String getLicenseName() { +// return licenseName; +// } public String getInceptionYear() { return inceptionYear; @@ -241,9 +240,9 @@ this.inceptionYear = inceptionYear; } - public void setLicenseName(String licenseName) { - this.licenseName = licenseName; - } +// public void setLicenseName(String licenseName) { +// this.licenseName = licenseName; +// } public void setOrganizationName(String organizationName) { this.organizationName = organizationName; Modified: trunk/src/main/java/org/nuiton/license/plugin/model/License.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/model/License.java 2010-04-06 21:35:23 UTC (rev 1717) +++ trunk/src/main/java/org/nuiton/license/plugin/model/License.java 2010-04-07 10:21:25 UTC (rev 1718) @@ -87,8 +87,10 @@ } public String getLicenseContent(String encoding) throws IOException { - if (licenseURL == null) { - throw new IllegalStateException("no licenseURL defined, can not obtain license content in " + this); + if (baseURL == null) { + throw new IllegalStateException( + "no baseURL defined, can not obtain license content in " + + this); } Reader r = new BufferedReader( @@ -102,7 +104,9 @@ public String getHeaderContent(String encoding) throws IOException { if (baseURL == null) { - throw new IllegalStateException("no baseURL defined, can not obtain header content in " + this); + throw new IllegalStateException( + "no baseURL defined, can not obtain header content in " + + this); } Reader r = new BufferedReader( new InputStreamReader(getHeaderURL().openStream(), encoding)); Modified: trunk/src/main/java/org/nuiton/license/plugin/model/LicenseRepository.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/model/LicenseRepository.java 2010-04-06 21:35:23 UTC (rev 1717) +++ trunk/src/main/java/org/nuiton/license/plugin/model/LicenseRepository.java 2010-04-07 10:21:25 UTC (rev 1718) @@ -85,7 +85,7 @@ if (!checkExists(definitionURL)) { throw new IllegalArgumentException( - "no licenses.properties found withurl [" + + "no licenses.properties found with url [" + definitionURL + "] for resolver " + this); } Properties p = new Properties(); @@ -102,8 +102,11 @@ license.setDescription(licenseDescription); license.setBaseURL(licenseURL); if (log.isInfoEnabled()) { - log.info("Adding license " + license); + log.info("register " + license.getDescription()); } + if (log.isDebugEnabled()) { + log.debug(license); + } licenses.add(license); } licenses = Collections.unmodifiableList(licenses); Modified: trunk/src/main/java/org/nuiton/license/plugin/model/LicenseStore.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/model/LicenseStore.java 2010-04-06 21:35:23 UTC (rev 1717) +++ trunk/src/main/java/org/nuiton/license/plugin/model/LicenseStore.java 2010-04-07 10:21:25 UTC (rev 1718) @@ -128,7 +128,7 @@ } if (log.isInfoEnabled()) { - log.info("Adding a license repository " + repository); + log.info("Adding a license repository " + repository.getBaseURL()); } repositories.add(repository); } Modified: trunk/src/test/java/org/nuiton/license/plugin/AddLicenseFileMojoTest.java =================================================================== --- trunk/src/test/java/org/nuiton/license/plugin/AddLicenseFileMojoTest.java 2010-04-06 21:35:23 UTC (rev 1717) +++ trunk/src/test/java/org/nuiton/license/plugin/AddLicenseFileMojoTest.java 2010-04-07 10:21:25 UTC (rev 1718) @@ -65,7 +65,8 @@ AddLicenseFileMojo mojo = getMojo(); - long t0 = mojo.getLicenseFile().lastModified(); + File licenseFile = mojo.getLicenseFile(); + long t0 = licenseFile.lastModified(); // always assume pom is older than any file // since we can not ensure order of copy test resources @@ -74,7 +75,7 @@ // then executing the mojo, will do NOT change the licence file mojo.execute(); - long t1 = mojo.getLicenseFile().lastModified(); + long t1 = licenseFile.lastModified(); assertEquals(t0, t1); @@ -82,7 +83,7 @@ mojo.setForce(true); mojo.execute(); - t1 = mojo.getLicenseFile().lastModified(); + t1 = licenseFile.lastModified(); assertTrue(t1 > t0); } @@ -92,7 +93,8 @@ AddLicenseFileMojo mojo = getMojo(); - long t0 = mojo.getLicenseFile().lastModified(); + File licenseFile = mojo.getLicenseFile(); + long t0 = licenseFile.lastModified(); // always assume pom is older than any file // since we can not ensure order of copy test resources @@ -101,7 +103,7 @@ // then executing the mojo, will do NOT change the licence file mojo.execute(); - long t1 = mojo.getLicenseFile().lastModified(); + long t1 = licenseFile.lastModified(); assertEquals(t0, t1); @@ -109,7 +111,7 @@ mojo.setForce(true); mojo.execute(); - t1 = mojo.getLicenseFile().lastModified(); + t1 = licenseFile.lastModified(); assertTrue(t1 > t0); } Modified: trunk/src/test/java/org/nuiton/license/plugin/model/LicenseRepositoryTest.java =================================================================== --- trunk/src/test/java/org/nuiton/license/plugin/model/LicenseRepositoryTest.java 2010-04-06 21:35:23 UTC (rev 1717) +++ trunk/src/test/java/org/nuiton/license/plugin/model/LicenseRepositoryTest.java 2010-04-07 10:21:25 UTC (rev 1718) @@ -41,5 +41,9 @@ License license = repository.getLicense(licenseName); Assert.assertNotNull(license); } + + for (String licenseName : repository.getLicenseNames()) { + Assert.assertTrue(LicenseStoreTest.DEFAULT_LICENSES.contains(licenseName)); + } } } Modified: trunk/src/test/java/org/nuiton/license/plugin/model/LicenseStoreTest.java =================================================================== --- trunk/src/test/java/org/nuiton/license/plugin/model/LicenseStoreTest.java 2010-04-06 21:35:23 UTC (rev 1717) +++ trunk/src/test/java/org/nuiton/license/plugin/model/LicenseStoreTest.java 2010-04-07 10:21:25 UTC (rev 1718) @@ -61,5 +61,10 @@ Assert.assertNotNull(license1); Assert.assertEquals(license, license1); } + + + for (String licenseName : store.getLicenseNames()) { + Assert.assertTrue(LicenseStoreTest.DEFAULT_LICENSES.contains(licenseName)); + } } }