October 2008 - Buix-commits - mailman.cloud.codelutin.com

r897 - lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources
by tchemit＠users.labs.libre-entreprise.org Oct. 11, 2008

Oct. 11, 2008

Author: tchemit Date: 2008-10-11 14:09:48 +0000 (Sat, 11 Oct 2008) New Revision: 897 Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/CSSTests.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/ClassReferences.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/Initializers.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/InnerClasses.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/OverridingDataBindings.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/Script.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/SpecialSubclassing.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/errors.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/force.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_text.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_title.xml lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_tooltiptext.xml Log: refactor tests of the plugin using maven-plugin-testing-harness plugin Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/CSSTests.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/CSSTests.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/CSSTests.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <i18nable>false</i18nable> + <includes> + <value>**/CSSTests/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/ClassReferences.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/ClassReferences.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/ClassReferences.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <includes> + <value>**/ClassReferences/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/Initializers.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/Initializers.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/Initializers.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <includes> + <value>**/Initializers/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/InnerClasses.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/InnerClasses.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/InnerClasses.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <includes> + <value>**/InnerClasses/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/OverridingDataBindings.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/OverridingDataBindings.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/OverridingDataBindings.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <includes> + <value>**/OverridingDataBindings/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/Script.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/Script.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/Script.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <includes> + <value>**/Script/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/SpecialSubclassing.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/SpecialSubclassing.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/SpecialSubclassing.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <includes> + <value>**/SpecialSubclassing/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/errors.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/errors.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/errors.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <includes> + <value>**/errors/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/force.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/force.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/force.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <includes> + <value>**/force/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_text.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_text.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_text.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <i18nable>true</i18nable> + <includes> + <value>**/i18n/text/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_title.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_title.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_title.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <i18nable>true</i18nable> + <includes> + <value>**/i18n/title/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_tooltiptext.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_tooltiptext.xml (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/resources/i18n_tooltiptext.xml 2008-10-11 14:09:48 UTC (rev 897) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<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"> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/src/test/resources</src> + <outJava>${basedir}/target/it-generated-source/java</outJava> + <outResource>${basedir}/target/it-generated-source/resources</outResource> + <force>true</force> + <i18nable>true</i18nable> + <includes> + <value>**/i18n/tooltiptext/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file

1 0

r896 - lutinjaxx/trunk/maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Oct. 11, 2008

Oct. 11, 2008

Author: tchemit Date: 2008-10-11 14:09:38 +0000 (Sat, 11 Oct 2008) New Revision: 896 Modified: lutinjaxx/trunk/maven-jaxx-plugin/changelog lutinjaxx/trunk/maven-jaxx-plugin/pom.xml Log: refactor tests of the plugin using maven-plugin-testing-harness plugin Modified: lutinjaxx/trunk/maven-jaxx-plugin/changelog =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/changelog 2008-10-11 14:09:14 UTC (rev 895) +++ lutinjaxx/trunk/maven-jaxx-plugin/changelog 2008-10-11 14:09:38 UTC (rev 896) @@ -1,3 +1,4 @@ ver-0-5 chemit 20081002 - * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin + * 20081011 [chemit] refactor tests of the plugin using maven-plugin-testing-harness plugin + * 20081002 [chemit] Using lutinpluginproject 3.0, changing groupId to org.codelutin * 20081002 [chemit] Make nearly all tests works again... Modified: lutinjaxx/trunk/maven-jaxx-plugin/pom.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-11 14:09:14 UTC (rev 895) +++ lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-11 14:09:38 UTC (rev 896) @@ -50,6 +50,12 @@ <artifactId>maven-project</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-plugin-testing-harness</artifactId> + <version>1.1</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.codelutin</groupId>

1 0

r895 - lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org Oct. 11, 2008

Oct. 11, 2008

Author: tchemit Date: 2008-10-11 14:09:14 +0000 (Sat, 11 Oct 2008) New Revision: 895 Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java Log: refactor tests of the plugin using maven-plugin-testing-harness plugin Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-11 14:08:31 UTC (rev 894) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-11 14:09:14 UTC (rev 895) @@ -1,111 +1,132 @@ package org.codelutin.jaxx; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import java.io.File; -public class CompilerTest extends AbstractCompilerTest { +public class CompilerTest extends AbstractMojoTestCase { - @CompileConfig(packageName = "InnerClasses", runJavac = true) - public void testInnerClasses() throws MojoExecutionException, MojoFailureException { - goal.execute(); + /** log */ + protected static final Log log = LogFactory.getLog(CompilerTest.class); + + @Override + protected void setUp() throws Exception { + super.setUp(); + log.info(getName()); } - - @CompileConfig(packageName = "SpecialSubclassing", runJavac = true) - public void testSpecialSubclassing() throws MojoExecutionException, MojoFailureException { - try { - goal.execute(); - } catch (Exception e) { - // there is some inter-dependances between generated java file - // we runJavaC on each file, but we should compile a sourcePath instead... - assertTrue(true); - } - goal.execute(); + protected JaxxGeneratorMojo getMojo(String s) throws Exception { + File testPom = new File(getBasedir(), "src/test/resources/" + s + ".xml"); + JaxxGeneratorMojo mojo = (JaxxGeneratorMojo) lookupMojo("generate", testPom); + assertNotNull(mojo); + return mojo; } - @CompileConfig(packageName = "CSSTests", verbose = false, i18nable = false) - public void testCssTests() throws MojoExecutionException, MojoFailureException { - goal.execute(); + public void testInnerClasses() throws Exception { + JaxxGeneratorMojo mojo = getMojo("InnerClasses"); + mojo.execute(); + assertEquals(1, mojo.getFiles().length); } - @CompileConfig(packageName = "errors", verbose = false) - public void testErrors() throws MojoExecutionException, MojoFailureException { - //fixme : launch a goal for each files found : since we should failed for some files... - //goal.execute(); + public void testSpecialSubclassing() throws Exception { + JaxxGeneratorMojo mojo = getMojo("SpecialSubclassing"); + mojo.execute(); + assertEquals(7, mojo.getFiles().length); } - @CompileConfig(packageName = "Initializers", runJavac = false) - public void testInitializers() throws MojoExecutionException, MojoFailureException { - goal.execute(); + public void testCssTests() throws Exception { + JaxxGeneratorMojo mojo = getMojo("CSSTests"); + mojo.execute(); + assertEquals(7, mojo.getFiles().length); } - @CompileConfig(packageName = "Script", runJavac = false) - public void testScript() throws MojoExecutionException, MojoFailureException { - try { - goal.execute(); - } catch (Exception e) { - // there is some inter-dependances between generated java file - // we runJavaC on each file, but we should compile a sourcePath instead... - assertTrue(true); + public void testErrors() throws Exception { + JaxxGeneratorMojo mojo = getMojo("errors"); + // init mojo to get alls files to treate + mojo.init(); + String[] files = mojo.getFiles(); + // execute mjo on each jaxx file to produce the error + for (String file : files) { + mojo.setFiles(new String[]{file}); + try { + mojo.execute(); + // should never pass + fail(); + } catch (MojoExecutionException e) { + // ok jaxx compiler failed + assertTrue(true); + } catch (MojoFailureException e) { + // this exception should not appear + fail(); + } } } - @CompileConfig(packageName = "OverridingDataBindings", runJavac = false) - public void testOverridingDataBindings() throws MojoExecutionException, MojoFailureException { - goal.execute(); + public void testInitializers() throws Exception { + JaxxGeneratorMojo mojo = getMojo("Initializers"); + mojo.execute(); + assertEquals(1, mojo.getFiles().length); } - @CompileConfig(packageName = "ClassReferences", runJavac = true) - public void testClassReferences() throws MojoExecutionException, MojoFailureException { - try { - goal.execute(); - } catch (Exception e) { - // there is some inter-dependances between generated java file - // we runJavaC on each file, but we should compile a sourcePath instead... - assertTrue(true); - } - goal.execute(); + public void testScript() throws Exception { + JaxxGeneratorMojo mojo = getMojo("Script"); + mojo.execute(); + assertEquals(1, mojo.getFiles().length); } - @CompileConfig(packageName = "force", verbose = false) - public void testForce() throws MojoExecutionException, MojoFailureException, InterruptedException { + public void testOverridingDataBindings() throws Exception { + JaxxGeneratorMojo mojo = getMojo("OverridingDataBindings"); + mojo.execute(); + assertEquals(3, mojo.getFiles().length); + } + + public void testClassReferences() throws Exception { + JaxxGeneratorMojo mojo = getMojo("ClassReferences"); + mojo.execute(); + assertEquals(6, mojo.getFiles().length); + } + + public void testForce() throws Exception { + + JaxxGeneratorMojo mojo = getMojo("force"); // first round, with force option so will generate theonly JButton.jaxx file - goal.execute(); - String[] files = goal.getFiles(); + mojo.execute(); + String[] files = mojo.getFiles(); assertEquals(1, files.length); - File srcFile = new File(goal.getSrc(), files[0]); + File srcFile = new File(mojo.getSrc(), files[0]); - File dstFile = goal.getUpdater().getMirrorFile(srcFile); + File dstFile = mojo.getUpdater().getMirrorFile(srcFile); long oldTime = dstFile.lastModified(); // second round, no force so will not the file - goal.setForce(false); - goal.execute(); - files = goal.getFiles(); + mojo.setForce(false); + mojo.execute(); + files = mojo.getFiles(); assertEquals(0, files.length); Thread.sleep(1000); - assertEquals(oldTime, goal.getUpdater().getMirrorFile(srcFile).lastModified()); + assertEquals(oldTime, mojo.getUpdater().getMirrorFile(srcFile).lastModified()); // three round : modify a source with no force option srcFile.setLastModified(System.currentTimeMillis()); - goal.execute(); - files = goal.getFiles(); + mojo.execute(); + files = mojo.getFiles(); assertEquals(1, files.length); - assertTrue(goal.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); + assertTrue(mojo.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); // last round, reforce file generation for an no modify source - goal.setForce(true); - goal.execute(); - files = goal.getFiles(); + mojo.setForce(true); + mojo.execute(); + files = mojo.getFiles(); assertEquals(1, files.length); - assertTrue(goal.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); + assertTrue(mojo.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); } - } \ No newline at end of file Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-11 14:08:31 UTC (rev 894) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-11 14:09:14 UTC (rev 895) @@ -1,59 +1,76 @@ package org.codelutin.jaxx; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.codelutin.util.FileUtil; import java.io.File; import java.io.IOException; -public class I18nTest extends AbstractCompilerTest { +public class I18nTest extends AbstractMojoTestCase { - @CompileConfig(packageName = "i18n.text", verbose = false, i18nable = false) - public void testI18nTextNoI1_nabel() throws MojoExecutionException, MojoFailureException, IOException { - goal.execute(); - checkPattern("testId.setText(_(\"test.text\"));", false); - } + /** log */ + protected static final Log log = LogFactory.getLog(I18nTest.class); - @CompileConfig(packageName = "i18n.title", verbose = false, i18nable = false) - public void testI18nTitleNoI18nable() throws MojoExecutionException, MojoFailureException, IOException { - goal.execute(); - checkPattern("testId.setTitle(_(\"test.title\"));", false); + + @Override + protected void setUp() throws Exception { + super.setUp(); + log.info(getName()); } - @CompileConfig(packageName = "i18n.tooltiptext", verbose = false, i18nable = false) - public void testI18nToolTipTextNoI18nable() throws MojoExecutionException, MojoFailureException, IOException { - goal.execute(); - checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));", false); + protected JaxxGeneratorMojo getMojo(String s) throws Exception { + File testPom = new File(getBasedir(), "src/test/resources/" + s + ".xml"); + JaxxGeneratorMojo mojo = (JaxxGeneratorMojo) lookupMojo("generate", testPom); + assertNotNull(mojo); + return mojo; } - @CompileConfig(packageName = "i18n.text", verbose = false, i18nable = true) - public void testI18nText() throws MojoExecutionException, MojoFailureException, IOException { - goal.execute(); - checkPattern("testId.setText(_(\"test.text\"));", true); - checkPattern("\"_(\\\"test.text\\\")\"", false); + public void testI18nText() throws Exception { + JaxxGeneratorMojo mojo = getMojo("i18n_text"); + mojo.setI18nable(false); + mojo.execute(); + checkPattern(mojo, "testId.setText(_(\"test.text\"));", false); + + mojo.setI18nable(true); + mojo.execute(); + checkPattern(mojo, "testId.setText(_(\"test.text\"));", true); + checkPattern(mojo, "\"_(\\\"test.text\\\")\"", false); } - @CompileConfig(packageName = "i18n.title", verbose = false, i18nable = true) - public void testI18nTitle() throws MojoExecutionException, MojoFailureException, IOException { - goal.execute(); - checkPattern("testId.setTitle(_(\"test.title\"));", true); - checkPattern("\"_(\\\"test.title\\\")\"", false); + public void testI18nTitle() throws Exception { + JaxxGeneratorMojo mojo = getMojo("i18n_title"); + mojo.setI18nable(false); + mojo.execute(); + checkPattern(mojo, "testId.setTitle(_(\"test.title\"));", false); + + mojo.setI18nable(true); + mojo.execute(); + checkPattern(mojo, "testId.setTitle(_(\"test.title\"));", true); + checkPattern(mojo, "\"_(\\\"test.title\\\")\"", false); } - @CompileConfig(packageName = "i18n.tooltiptext", verbose = false, i18nable = true) - public void testI18nToolTipText() throws MojoExecutionException, MojoFailureException, IOException { - goal.execute(); - checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));", true); - checkPattern("\"_(\\\"test.toolTipText\\\")\"", false); + public void testI18nToolTipText() throws Exception { + JaxxGeneratorMojo mojo = getMojo("i18n_tooltiptext"); + mojo.setI18nable(false); + mojo.execute(); + checkPattern(mojo, "testId.setToolTipText(_(\"test.toolTipText\"));", false); + + mojo.setI18nable(true); + mojo.execute(); + checkPattern(mojo, "testId.setToolTipText(_(\"test.toolTipText\"));", true); + checkPattern(mojo, "\"_(\\\"test.toolTipText\\\")\"", false); } - protected void checkPattern(String pattern, boolean required) throws IOException { - String[] files = goal.getFiles(); + protected void checkPattern(JaxxGeneratorMojo mojo, String pattern, boolean required) throws IOException { + String[] files = mojo.getFiles(); for (String file : files) { // check we have a the required testId.setTitle(_("test.title")); - File f = new File(getOutDir(), file.substring(0, file.length() - 4) + "java"); - log.info("check generated file " + f); + File f = new File(mojo.getOutJava(), file.substring(0, file.length() - 4) + "java"); + if (mojo.isVerbose()) { + log.info("check generated file " + f); + } assertTrue("generated file " + f + " was not found...", f.exists()); String content = FileUtil.readAsString(f);

1 0

r894 - lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org Oct. 11, 2008

Oct. 11, 2008

Author: tchemit Date: 2008-10-11 14:08:31 +0000 (Sat, 11 Oct 2008) New Revision: 894 Removed: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java Log: refactor tests of the plugin using maven-plugin-testing-harness plugin Deleted: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java 2008-10-11 14:06:12 UTC (rev 893) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java 2008-10-11 14:08:31 UTC (rev 894) @@ -1,97 +0,0 @@ -package org.codelutin.jaxx; - -import junit.framework.TestCase; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; - -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** @author chemit */ -public abstract class AbstractCompilerTest extends TestCase { - /** log */ - protected static final Log log = LogFactory.getLog(I18nTest.class); - /** mojo goal */ - protected JaxxGeneratorMojo goal; - - protected static final String PREFIX_PACKAGE = "testcases"; - protected static File basedir; - protected static File srcDir; - protected static File outDir; - protected static File ClassOutDir; - protected static File ResourcesOutDir; - - public static File getBasedir() { - if (basedir == null) { - String basedirStr = System.getProperty("basedir"); - basedir = new File(basedirStr == null ? "." : basedirStr); - log.info("use basedir : "+basedir); - } - return basedir; - } - - protected static File getSrcDir() { - if (srcDir == null) { - srcDir = new File(getBasedir(), "src" + File.separator + "test" + File.separator + "java"); - } - return srcDir; - } - - protected static File getOutDir() { - if (outDir == null) { - outDir = new File(getBasedir(), "target" + File.separator + "test-generated-sources" + File.separator + "java"); - outDir.mkdirs(); - } - return outDir; - } - - protected static File getClassOutDir() { - if (ClassOutDir == null) { - ClassOutDir = new File(getBasedir(), "target" + File.separator + "test-classes"); - ClassOutDir.mkdirs(); - } - return ClassOutDir; - } - - protected static File getResourcesOutDir() { - if (ResourcesOutDir == null) { - ResourcesOutDir = new File(getBasedir(), "target" + File.separator + "test-classes"); - ResourcesOutDir.mkdirs(); - } - return ResourcesOutDir; - } - - @Override - public void setUp() throws IOException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, MojoExecutionException, MojoFailureException { - CompileConfig anno = getClass().getMethod(getName()).getAnnotation(CompileConfig.class); - assertNotNull("could not found " + CompileConfig.class.getSimpleName() + " annotation on test " + getClass(), anno); - final File srcDir = getSrcDir(); - assertTrue("could not found srcDir (or not existing) : " + srcDir + " on test " + getClass(), srcDir != null && srcDir.exists()); - final File outDir = getOutDir(); - assertTrue("could not found outDir (or not existing) : " + outDir + " on test " + getClass(), outDir != null && outDir.exists()); - final File classOutDir = getClassOutDir(); - assertTrue("could not found classOutDir (or not existing) : " + classOutDir + " on test " + getClass(), classOutDir != null && classOutDir.exists()); - final File resourcesOutDir = getResourcesOutDir(); - assertTrue("could not found classOutDir (or not existing) : " + resourcesOutDir + " on test " + getClass(), resourcesOutDir != null && resourcesOutDir.exists()); - String packageName = anno.packageName(); - goal = new JaxxGeneratorMojo(); - goal.setSrc(srcDir); - goal.setOutJava(outDir); - goal.setOutClass(classOutDir); - goal.setOutResource(resourcesOutDir); - //goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); - String expression = packageName.replaceAll("\\.", "\\\\/"); - goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + expression + "\\/*.jaxx"}); - goal.setOptimize(anno.optimize()); - goal.setVerbose(anno.verbose()); - goal.setForce(anno.force()); - goal.setI18nable(anno.i18nable()); - //TODO Use the maven plexus TestCase inorder to include dependencies - goal.setJavaOpts(anno.javaOpts()); - log.info("setUp test " + getName()); - } -} Deleted: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java 2008-10-11 14:06:12 UTC (rev 893) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java 2008-10-11 14:08:31 UTC (rev 894) @@ -1,46 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package org.codelutin.jaxx; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Une annotation pour configurer les tests de compilation. - * - * @author chemit - */ -(a)Retention(java.lang.annotation.RetentionPolicy.RUNTIME) -@Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) -public @interface CompileConfig { - - public String packageName(); - - public boolean optimize() default true; - - public boolean runJavac() default false; - - public boolean verbose() default false; - - public boolean force() default true; - - public boolean i18nable() default false; - - public String javaOpts() default ""; -}

1 0

r893 - in lutinjaxx/trunk/jaxx-core: . src/main/java/jaxx/reflect src/test/java/jaxx/junit
by tchemit＠users.labs.libre-entreprise.org Oct. 11, 2008

Oct. 11, 2008

Author: tchemit Date: 2008-10-11 14:06:12 +0000 (Sat, 11 Oct 2008) New Revision: 893 Added: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java Modified: lutinjaxx/trunk/jaxx-core/changelog lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java Log: fix bug on JavaFileParser : works again Modified: lutinjaxx/trunk/jaxx-core/changelog =================================================================== --- lutinjaxx/trunk/jaxx-core/changelog 2008-10-09 11:08:39 UTC (rev 892) +++ lutinjaxx/trunk/jaxx-core/changelog 2008-10-11 14:06:12 UTC (rev 893) @@ -1,4 +1,5 @@ -ver-0-5 chemit 20081002 + ver-0-5 chemit 20081002 + * 20081011 [chemit] fix bug on JavaFileParser : works again * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) * 20081002 [chemit] Introduce JAXXContext Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java 2008-10-09 11:08:39 UTC (rev 892) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java 2008-10-11 14:06:12 UTC (rev 893) @@ -83,6 +83,7 @@ SimpleNode node = p.popNode(); if (node != null) { scanCompilationUnit(node); + return; } throw new CompilerException("Internal error: null node parsing Java file from " + src); } Copied: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java (from rev 884, lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/ClassDescriptorTest.java) =================================================================== --- lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java 2008-10-11 14:06:12 UTC (rev 893) @@ -0,0 +1,53 @@ +package jaxx.junit; + +import jaxx.CompilerException; +import jaxx.reflect.ClassDescriptor; +import jaxx.reflect.JavaFileParser; +import junit.framework.TestCase; + +import java.io.File; +import java.io.FileReader; +import java.io.Reader; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class JavaFileParserTest extends TestCase { + + + /** log */ + protected static final Log log = LogFactory.getLog(JavaFileParserTest.class); + + protected File getBaseDir() { + // get maven env basedir + String basedir = System.getenv("basedir"); + if (basedir == null) { + basedir = new File("").getAbsolutePath(); + } + return new File(basedir); + } + + public void testParseJavaSourceFile() throws Exception { + + + File testSourceRoot = new File(getBaseDir(), "src" + File.separator + "test" + File.separator + "java"); + assertTrue(testSourceRoot.exists()); + + File src = new File(testSourceRoot, getClass().getName().replaceAll("\\.", File.separator) + ".java"); + assertTrue(src.exists()); + log.info("trying parsing file " + src); + Reader reader = new FileReader(src); + try { + ClassDescriptor result = JavaFileParser.parseJavaFile("TestParserJava", reader, getClass().getClassLoader()); + assertNotNull(result); + + } catch (CompilerException e) { + log.error("could not parse file "+src+" for reason "+e.getMessage(),e); + fail(e.getMessage()); + } + finally { + reader.close(); + } + } + +} Property changes on: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaFileParserTest.java ___________________________________________________________________ Name: svn:mergeinfo +

1 0

r892 - in lutinjaxx/trunk: jaxx-core/src/main/java/jaxx/tags/swing maven-jaxx-plugin/src/test/java/org/codelutin/jaxx maven-jaxx-plugin/src/test/java/testcases/i18n/title maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext
by tchemit＠users.labs.libre-entreprise.org Oct. 9, 2008

Oct. 9, 2008

Author: tchemit Date: 2008-10-09 11:08:39 +0000 (Thu, 09 Oct 2008) New Revision: 892 Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java Log: fix bug sur i18n et les JTabbedPaneHandler Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java 2008-10-08 16:01:29 UTC (rev 891) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java 2008-10-09 11:08:39 UTC (rev 892) @@ -7,6 +7,7 @@ import jaxx.CompilerException; import jaxx.compiler.CompiledObject; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.I18nHelper; import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; import jaxx.runtime.swing.TabInfo; @@ -56,12 +57,28 @@ String title = tabInfo.getTitle(); if (title != null) { - appendAdditionCode(getId() + ".setTitleAt(" + tabIndex + ", " + TypeManager.getJavaCode(title) + ");"); + if (I18nHelper.isI18nAttribute("title")) { + if (!title.startsWith("_(\"")) { + // we did not have the invocation code, add it + title = I18nHelper.addI18nInvocation(getId(),"title", TypeManager.getJavaCode(title),compiler); + } + } else { + title = TypeManager.getJavaCode(title); + } + appendAdditionCode(getId() + ".setTitleAt(" + tabIndex + ", " + title + ");"); } String toolTipText = tabInfo.getToolTipText(); if (toolTipText != null) { - appendAdditionCode(getId() + ".setToolTipTextAt(" + tabIndex + ", " + TypeManager.getJavaCode(toolTipText) + ");"); + if (I18nHelper.isI18nAttribute("toolTipText")) { + if (!toolTipText.startsWith("_(\"")) { + // we did not have the invocation code, add it + toolTipText = I18nHelper.addI18nInvocation(getId(),"toolTipText", TypeManager.getJavaCode(toolTipText),compiler); + } + } else { + toolTipText = TypeManager.getJavaCode(toolTipText); + } + appendAdditionCode(getId() + ".setToolTipTextAt(" + tabIndex + ", " + toolTipText + ");"); } boolean enabled = tabInfo.isEnabled(); Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-08 16:01:29 UTC (rev 891) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-09 11:08:39 UTC (rev 892) @@ -31,18 +31,21 @@ public void testI18nText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); checkPattern("testId.setText(_(\"test.text\"));", true); + checkPattern("\"_(\\\"test.text\\\")\"", false); } @CompileConfig(packageName = "i18n.title", verbose = false, i18nable = true) public void testI18nTitle() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); checkPattern("testId.setTitle(_(\"test.title\"));", true); + checkPattern("\"_(\\\"test.title\\\")\"", false); } @CompileConfig(packageName = "i18n.tooltiptext", verbose = false, i18nable = true) public void testI18nToolTipText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));", true); + checkPattern("\"_(\\\"test.toolTipText\\\")\"", false); } protected void checkPattern(String pattern, boolean required) throws IOException { @@ -54,7 +57,9 @@ assertTrue("generated file " + f + " was not found...", f.exists()); String content = FileUtil.readAsString(f); - assertEquals("could not find the pattern : " + pattern + " in file " + f, required, content.contains(pattern)); + + String errorMessage = required ? "could not find the pattern : " : "should not have found pattern :"; + assertEquals(errorMessage + pattern + " in file " + f, required, content.contains(pattern)); } } Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx (from rev 884, lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane.jaxx) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx 2008-10-09 11:08:39 UTC (rev 892) @@ -0,0 +1,5 @@ +<JTabbedPane> + <tab id="testId" title='test.title'> + <JLabel text='testLabel'/> + </tab> +</JTabbedPane> \ No newline at end of file Property changes on: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx ___________________________________________________________________ Name: svn:mergeinfo + Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx (from rev 884, lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane2.jaxx) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx 2008-10-09 11:08:39 UTC (rev 892) @@ -0,0 +1,5 @@ +<JTabbedPane> + <tab id="testId" toolTipText='test.toolTipText'> + <JLabel text='yo'/> + </tab> +</JTabbedPane> \ No newline at end of file Property changes on: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx ___________________________________________________________________ Name: svn:mergeinfo +

1 0

r891 - in lutinjaxx/trunk: jaxx-util maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Oct. 8, 2008

Oct. 8, 2008

Author: tchemit Date: 2008-10-08 16:01:29 +0000 (Wed, 08 Oct 2008) New Revision: 891 Modified: lutinjaxx/trunk/jaxx-util/pom.xml lutinjaxx/trunk/maven-jaxx-plugin/pom.xml Log: use plugin for plugin Modified: lutinjaxx/trunk/jaxx-util/pom.xml =================================================================== --- lutinjaxx/trunk/jaxx-util/pom.xml 2008-10-08 16:00:46 UTC (rev 890) +++ lutinjaxx/trunk/jaxx-util/pom.xml 2008-10-08 16:01:29 UTC (rev 891) @@ -16,7 +16,6 @@ <packaging>jar</packaging> <version>0.5-SNAPSHOT</version> <description>Jaxx lutin library utility</description> -  <build> <plugins> Modified: lutinjaxx/trunk/maven-jaxx-plugin/pom.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-08 16:00:46 UTC (rev 890) +++ lutinjaxx/trunk/maven-jaxx-plugin/pom.xml 2008-10-08 16:01:29 UTC (rev 891) @@ -83,6 +83,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <id>helpmojo</id> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> </plugin> </plugins> @@ -93,6 +102,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> + <version>2.4.3</version> </plugin> </plugins> </reporting>

1 0

r890 - lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org Oct. 8, 2008

Oct. 8, 2008

Author: tchemit Date: 2008-10-08 16:00:46 +0000 (Wed, 08 Oct 2008) New Revision: 890 Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java Log: remove accent Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-07 19:20:48 UTC (rev 889) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-08 16:00:46 UTC (rev 890) @@ -60,7 +60,7 @@ protected MavenProject project; /** - * Répertoire de destination des fichiers java a generer. + * Repertoire de destination des fichiers java a generer. * * @parameter expression="${jaxx.outJava}" default-value="${basedir}/target/generated-sources/java" */

1 0

r889 - lutinjaxx/trunk/maven-jaxx-plugin/src/site
by tchemit＠users.labs.libre-entreprise.org Oct. 7, 2008

Oct. 7, 2008

Author: tchemit Date: 2008-10-07 19:20:48 +0000 (Tue, 07 Oct 2008) New Revision: 889 Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml Log: add goals in site Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml 2008-10-07 18:59:47 UTC (rev 888) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/site/site.xml 2008-10-07 19:20:48 UTC (rev 889) @@ -34,8 +34,7 @@ <menu ref="parent"/> <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> - <item name="Goals" href="plugin-info.html"/> - <item name="Détail goals"> + <item name="Détail goals" href="plugin-info.html"> <item name="generate" href="generate-mojo.html"/> <item name="help" href="help-mojo.html"/> </item>

1 0

r888 - in lutinjaxx/trunk: jaxx-core/src/main/java/jaxx/compiler maven-jaxx-plugin/src/main/java/org/codelutin/jaxx maven-jaxx-plugin/src/test/java/org/codelutin/jaxx
by tchemit＠users.labs.libre-entreprise.org Oct. 7, 2008

Oct. 7, 2008

Author: tchemit Date: 2008-10-07 18:59:47 +0000 (Tue, 07 Oct 2008) New Revision: 888 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java Log: add force and i18nable options to mojo generate Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompilerOptions.java 2008-10-07 18:59:47 UTC (rev 888) @@ -1,6 +1,7 @@ package jaxx.compiler; import java.io.File; +import java.util.Arrays; /** * Stores options which affect the jaxxc tool's operation. These options are generally specified by the @@ -14,6 +15,8 @@ private boolean keepJavaFiles; private boolean optimize; private boolean verbose; + /** a flag to enable or disable i18n generation */ + private boolean i18nable; /** * Returns the target directory, generally specified with the "-d" option on the command line. @@ -148,4 +151,25 @@ public void setVerbose(boolean verbose) { this.verbose = verbose; } + + public boolean isI18nable() { + return i18nable; + } + + public void setI18nable(boolean i18nable) { + this.i18nable = i18nable; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(super.toString()); + sb.append("\nclassPath: ").append(getClassPath()); + sb.append("\njavaOut : ").append(getTargetDirectory()); + sb.append("\noutClass : ").append(getJavacTargetDirectory()); + sb.append("\njavacOpts: ").append(getJavacOpts()); + sb.append("\nverbose: ").append(isVerbose()); + sb.append("\noptiomize: ").append(getOptimize()); + sb.append("\ni18nable: ").append(isI18nable()); + return sb.toString(); + } } Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2008-10-07 18:59:47 UTC (rev 888) @@ -29,14 +29,18 @@ import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.DirectoryScanner; +import org.codelutin.util.FileUpdaterHelper; +import org.codelutin.util.MirroredFileUpdater; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Set; -import java.util.Arrays; /** * Classe permettant de transformer des sources jaxx vers du source java. @@ -111,12 +115,32 @@ */ protected String[] includes; + /** + * to force generation of java source for any jaxx files with no timestamp checking. + * <p/> + * By default, never force generation. + * + * @parameter expression="${jaxx.force}" default-value="false" + */ + protected boolean force; + + /** + * to make compiler i18nable, says add the {@link org.codelutin.i18n.I18n#_(String, Object[])} method + * invocation on {@link jaxx.compiler.I18nHelper#I18N_ATTRIBUTES} attributes. + * + * @parameter expression="${jaxx.i18nable}" default-value="true" + * @see jaxx.compiler.I18nHelper + */ + protected boolean i18nable; + protected String[] files; private static final String[] INCLUDES = {"**\\/*.jaxx"}; protected CompilerOptions options; + protected MirroredFileUpdater updater ; + protected void init() { if (!outResource.exists()) { @@ -135,8 +159,36 @@ boolean noIncludes = includes == null || includes.length == 0; ds.setIncludes(noIncludes ? INCLUDES : includes); ds.scan(); - files = ds.getIncludedFiles(); - getLog().info("jaxx - found " + files.length + " file(s) to generate. "); + String[] files = ds.getIncludedFiles(); + if (verbose) { + getLog().info("jaxx - discover " + files.length + " jaxx file(s). "); + } + + updater = (MirroredFileUpdater) FileUpdaterHelper.newJaxxFileUpdater(src, outJava); + + if (force) { + // we will regenerate all files + this.files = files; + } else { + // filter files + List<String> listFiles = new ArrayList<String>(); + + for (String file : files) { + if (updater.isFileUpToDate(new File(src, file))) { + if (verbose) { + getLog().info("jaxx - skip file [" + file + "]."); + } + } else { + if (verbose) { + getLog().info("jaxx - will generate file [" + file + "]."); + } + listFiles.add(file); + } + } + this.files = listFiles.toArray(new String[listFiles.size()]); + } + + options = toCompilerOptions(); if (verbose) { @@ -166,18 +218,15 @@ result.setJavacTargetDirectory(outClass); result.setTargetDirectory(outJava); result.setVerbose(verbose); + result.setI18nable(i18nable); return result; } protected void printInit() { - getLog().info("classPath: " + options.getClassPath()); - getLog().info("javaOut : " + options.getTargetDirectory()); - getLog().info("outClass : " + options.getJavacTargetDirectory()); - getLog().info("javacOpts: " + options.getJavacOpts()); - getLog().info("optiomize: " + options.getOptimize()); + getLog().info(options.toString()); getLog().info("includes : " + Arrays.toString(includes)); for (String file : files) { - getLog().info(file); + getLog().info("will generate "+file); } ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -197,7 +246,7 @@ } //fixme should remove this silly test when we will make real maven plugin tests :) - if (getPluginContext()!=null) { + if (getPluginContext() != null) { for (Object e : getPluginContext().keySet()) { getLog().info("pluginContext " + e + " : " + getPluginContext().get(e)); } @@ -208,6 +257,13 @@ init(); + if (files.length == 0) { + getLog().info("jaxx - no jaxx file to treate. "); + return; + } + + getLog().info("jaxx - will generate " + this.files.length + " jaxx file(s). "); + try { doExecute(); @@ -227,7 +283,7 @@ protected void fixCompileSourceRoots() { //fixme should remove this silly test when we will make real maven plugin tests :) - if (project!=null) { + if (project != null) { if (!project.getCompileSourceRoots().contains(outJava.getPath())) { project.addCompileSourceRoot(outJava.getPath()); } @@ -346,4 +402,23 @@ this.files = files; } + public boolean isForce() { + return force; + } + + public void setForce(boolean force) { + this.force = force; + } + + public boolean isI18nable() { + return i18nable; + } + + public void setI18nable(boolean i18nable) { + this.i18nable = i18nable; + } + + public MirroredFileUpdater getUpdater() { + return updater; + } } \ No newline at end of file Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/AbstractCompilerTest.java 2008-10-07 18:59:47 UTC (rev 888) @@ -88,6 +88,8 @@ goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + expression + "\\/*.jaxx"}); goal.setOptimize(anno.optimize()); goal.setVerbose(anno.verbose()); + goal.setForce(anno.force()); + goal.setI18nable(anno.i18nable()); //TODO Use the maven plexus TestCase inorder to include dependencies goal.setJavaOpts(anno.javaOpts()); log.info("setUp test " + getName()); Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompileConfig.java 2008-10-07 18:59:47 UTC (rev 888) @@ -38,5 +38,9 @@ public boolean verbose() default false; + public boolean force() default true; + + public boolean i18nable() default false; + public String javaOpts() default ""; } Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2008-10-07 18:59:47 UTC (rev 888) @@ -3,6 +3,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import java.io.File; + public class CompilerTest extends AbstractCompilerTest { @CompileConfig(packageName = "InnerClasses", runJavac = true) @@ -23,7 +25,7 @@ goal.execute(); } - @CompileConfig(packageName = "CSSTests", verbose = false) + @CompileConfig(packageName = "CSSTests", verbose = false, i18nable = false) public void testCssTests() throws MojoExecutionException, MojoFailureException { goal.execute(); } @@ -67,5 +69,43 @@ goal.execute(); } + @CompileConfig(packageName = "force", verbose = false) + public void testForce() throws MojoExecutionException, MojoFailureException, InterruptedException { + // first round, with force option so will generate theonly JButton.jaxx file + goal.execute(); + String[] files = goal.getFiles(); + assertEquals(1, files.length); + File srcFile = new File(goal.getSrc(), files[0]); + + File dstFile = goal.getUpdater().getMirrorFile(srcFile); + + long oldTime = dstFile.lastModified(); + // second round, no force so will not the file + goal.setForce(false); + goal.execute(); + files = goal.getFiles(); + assertEquals(0, files.length); + + Thread.sleep(1000); + + assertEquals(oldTime, goal.getUpdater().getMirrorFile(srcFile).lastModified()); + + // three round : modify a source with no force option + srcFile.setLastModified(System.currentTimeMillis()); + + goal.execute(); + files = goal.getFiles(); + assertEquals(1, files.length); + + assertTrue(goal.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); + + // last round, reforce file generation for an no modify source + goal.setForce(true); + goal.execute(); + files = goal.getFiles(); + assertEquals(1, files.length); + assertTrue(goal.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); + } + } \ No newline at end of file Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-07 18:59:01 UTC (rev 887) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-07 18:59:47 UTC (rev 888) @@ -9,28 +9,43 @@ public class I18nTest extends AbstractCompilerTest { - @CompileConfig(packageName = "i18n.text", verbose = false) + @CompileConfig(packageName = "i18n.text", verbose = false, i18nable = false) + public void testI18nTextNoI1_nabel() throws MojoExecutionException, MojoFailureException, IOException { + goal.execute(); + checkPattern("testId.setText(_(\"test.text\"));", false); + } + + @CompileConfig(packageName = "i18n.title", verbose = false, i18nable = false) + public void testI18nTitleNoI18nable() throws MojoExecutionException, MojoFailureException, IOException { + goal.execute(); + checkPattern("testId.setTitle(_(\"test.title\"));", false); + } + + @CompileConfig(packageName = "i18n.tooltiptext", verbose = false, i18nable = false) + public void testI18nToolTipTextNoI18nable() throws MojoExecutionException, MojoFailureException, IOException { + goal.execute(); + checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));", false); + } + + @CompileConfig(packageName = "i18n.text", verbose = false, i18nable = true) public void testI18nText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); - assertTrue(true); - checkPattern("testId.setText(_(\"test.text\"));"); + checkPattern("testId.setText(_(\"test.text\"));", true); } - @CompileConfig(packageName = "i18n.title", verbose = false) + @CompileConfig(packageName = "i18n.title", verbose = false, i18nable = true) public void testI18nTitle() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); - assertTrue(true); - checkPattern("testId.setTitle(_(\"test.title\"));"); + checkPattern("testId.setTitle(_(\"test.title\"));", true); } - @CompileConfig(packageName = "i18n.tooltiptext", verbose = false) + @CompileConfig(packageName = "i18n.tooltiptext", verbose = false, i18nable = true) public void testI18nToolTipText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); - assertTrue(true); - checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));"); + checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));", true); } - protected void checkPattern(String pattern) throws IOException { + protected void checkPattern(String pattern, boolean required) throws IOException { String[] files = goal.getFiles(); for (String file : files) { // check we have a the required testId.setTitle(_("test.title")); @@ -39,7 +54,7 @@ assertTrue("generated file " + f + " was not found...", f.exists()); String content = FileUtil.readAsString(f); - assertTrue("could not find the pattern : " + pattern + " in file " + f, content.contains(pattern)); + assertEquals("could not find the pattern : " + pattern + " in file " + f, required, content.contains(pattern)); } }

1 0