[Jaxx-commits] 50/94: - ajout test sur bindings - les fichiers generes sont dans target/generated-sources

This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-1 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 67318a5c95a436da6a48edbba40ac2264210fe38 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:20:17 2009 +0000 - ajout test sur bindings - les fichiers generes sont dans target/generated-sources --- maven-jaxx-plugin/pom.xml | 6 ++-- .../org/nuiton/jaxx/plugin/DataBinding/Bean.java | 16 +++++++++ .../nuiton/jaxx/plugin/DataBinding/BeanImpl.java | 38 ++++++++++++++++++++++ .../org/nuiton/jaxx/plugin/DataBindingTest.java | 33 +++++++++++++++++++ .../src/test/resources/log4j.properties | 9 +++++ .../nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml | 2 +- .../nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml | 2 +- .../nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml | 2 +- .../nuiton/jaxx/plugin/CompilerTest/CSSTests.xml | 2 +- .../jaxx/plugin/CompilerTest/ClassReferences.xml | 2 +- .../jaxx/plugin/CompilerTest/ClientProperty.xml | 2 +- .../ErrorJaxxContextImplementorClass.xml | 2 +- .../org/nuiton/jaxx/plugin/CompilerTest/Errors.xml | 2 +- .../org/nuiton/jaxx/plugin/CompilerTest/Force.xml | 2 +- .../org/nuiton/jaxx/plugin/CompilerTest/Icon.xml | 2 +- .../jaxx/plugin/CompilerTest/Initializers.xml | 2 +- .../jaxx/plugin/CompilerTest/InnerClasses.xml | 2 +- .../org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml | 2 +- .../plugin/CompilerTest/OverridingDataBindings.xml | 2 +- .../org/nuiton/jaxx/plugin/CompilerTest/Script.xml | 2 +- .../plugin/CompilerTest/SpecialSubclassing.xml | 2 +- .../nuiton/jaxx/plugin/CompilerTest/WithLog.xml | 2 +- .../CompilerValidatorTest/ValidatorErrors.xml | 2 +- .../plugin/CompilerValidatorTest/ValidatorOk.xml | 2 +- .../nuiton/jaxx/plugin/DataBindingTest/First.jaxx | 24 ++++++++++++++ .../simpleBinding.xml} | 5 ++- .../nuiton/jaxx/plugin/DecoratorTest/Decorator.xml | 2 +- .../nuiton/jaxx/plugin/Evolution74Test/error.xml | 2 +- .../org/nuiton/jaxx/plugin/Evolution74Test/ok.xml | 2 +- .../org/nuiton/jaxx/plugin/I18nTest/I18nText.xml | 2 +- .../org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml | 2 +- .../jaxx/plugin/I18nTest/I18nToolTipText.xml | 2 +- 32 files changed, 150 insertions(+), 31 deletions(-) diff --git a/maven-jaxx-plugin/pom.xml b/maven-jaxx-plugin/pom.xml index 9a623a1..5776077 100644 --- a/maven-jaxx-plugin/pom.xml +++ b/maven-jaxx-plugin/pom.xml @@ -129,7 +129,7 @@ </execution> </executions> </plugin> - + </plugins> <pluginManagement> @@ -491,5 +491,5 @@ </plugin> </plugins> </reporting> - -</project> \ No newline at end of file + +</project> diff --git a/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/Bean.java b/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/Bean.java new file mode 100644 index 0000000..c788f0b --- /dev/null +++ b/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/Bean.java @@ -0,0 +1,16 @@ +package org.nuiton.jaxx.plugin.DataBinding; + +import java.beans.PropertyChangeListener; + +public interface Bean { + + void addPropertyChangeListener(PropertyChangeListener listener); + + void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); + + void removePropertyChangeListener(PropertyChangeListener listener); + + void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); + + String getText(); +} diff --git a/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java b/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java new file mode 100644 index 0000000..6ba6af7 --- /dev/null +++ b/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBinding/BeanImpl.java @@ -0,0 +1,38 @@ +package org.nuiton.jaxx.plugin.DataBinding; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +public class BeanImpl { + + protected String text; + PropertyChangeSupport p; + + public BeanImpl() { + p = new PropertyChangeSupport(this); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + p.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + p.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.removePropertyChangeListener(propertyName, listener); + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} diff --git a/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBindingTest.java b/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBindingTest.java new file mode 100644 index 0000000..6da3c76 --- /dev/null +++ b/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/DataBindingTest.java @@ -0,0 +1,33 @@ +package org.nuiton.jaxx.plugin; + +import java.io.IOException; +import org.junit.Test; + +/** + * + * @author chemit + * @since 2.0.0 + */ +public class DataBindingTest extends JaxxBaseTest { + + @Test + public void simpleBinding() throws Exception { + + GenerateMojo mojo = getMojo(); + mojo.execute(); + assertNumberJaxxFiles(1); + + // no bindings + checkPattern(mojo, "new jaxx.runtime.DataBindingListener(this, \"nobinding1.text\");", false); + checkPattern(mojo, "new jaxx.runtime.DataBindingListener(this, \"nobinding2.text\");", false); + + // with bindings + checkBinding(mojo, "binding8.text"); + } + + protected void checkBinding(GenerateMojo mojo, String... bindings) throws IOException { + for (String b : bindings) { + checkPattern(mojo, "new jaxx.runtime.DataBindingListener(this, \"" + b + "\");", true); + } + } +} diff --git a/maven-jaxx-plugin/src/test/resources/log4j.properties b/maven-jaxx-plugin/src/test/resources/log4j.properties new file mode 100644 index 0000000..6346919 --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/log4j.properties @@ -0,0 +1,9 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +log4j.logger.jaxx.compiler=INFO +log4j.logger.jaxx.compiler.binding=DEBUG diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml index 042f3b2..688e7fc 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml index 7975f5c..2eec7f4 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1750Test/Bug_1750.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml index 9c7d24a..504449d 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1751Test/Bug_1751.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <i18nable>true</i18nable> <force>true</force> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/CSSTests.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/CSSTests.xml index 067c35c..0250aa0 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/CSSTests.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/CSSTests.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <i18nable>false</i18nable> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClassReferences.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClassReferences.xml index 54e16e9..86d0515 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClassReferences.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClassReferences.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClientProperty.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClientProperty.xml index 922bd7b..8f85092 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClientProperty.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ClientProperty.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <addLogger>false</addLogger> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ErrorJaxxContextImplementorClass.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ErrorJaxxContextImplementorClass.xml index bb63409..fb3fb0e 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ErrorJaxxContextImplementorClass.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/ErrorJaxxContextImplementorClass.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <jaxxContextFQN>java.lang.String</jaxxContextFQN> <force>true</force> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Errors.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Errors.xml index 6651676..38802a4 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Errors.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Errors.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Force.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Force.xml index 2918a07..160c4f4 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Force.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Force.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Icon.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Icon.xml index 69318f6..82a93d1 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Icon.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Icon.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <i18nable>false</i18nable> <force>true</force> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Initializers.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Initializers.xml index 7e5fc72..7b77755 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Initializers.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Initializers.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/InnerClasses.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/InnerClasses.xml index b86cac8..39682cc 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/InnerClasses.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/InnerClasses.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml index ed14568..d0ad728 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/NoLog.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <addLogger>false</addLogger> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/OverridingDataBindings.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/OverridingDataBindings.xml index 4860b09..45334a0 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/OverridingDataBindings.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/OverridingDataBindings.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Script.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Script.xml index 6f52cdf..55453c8 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Script.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/Script.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing.xml index aff3c0a..bcec799 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/SpecialSubclassing.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/WithLog.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/WithLog.xml index e2af511..f695cca 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/WithLog.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerTest/WithLog.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <addLogger>true</addLogger> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorErrors.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorErrors.xml index 6e82724..17677f1 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorErrors.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorErrors.xml @@ -14,7 +14,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorOk.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorOk.xml index 41cb77f..3cc42f0 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorOk.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/CompilerValidatorTest/ValidatorOk.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/First.jaxx b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/First.jaxx new file mode 100644 index 0000000..157d7d8 --- /dev/null +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/First.jaxx @@ -0,0 +1,24 @@ + +<JPanel> + + <java.io.File id='file' constructorParams='""'/> + <java.io.File id='file2' javaBean='new File("")'/> + + <org.nuiton.jaxx.plugin.DataBinding.Bean id='bean' javaBean='new BeanImpl()'/> + <org.nuiton.jaxx.plugin.DataBinding.BeanImpl id='beanImpl' javaBean='new BeanImpl()'/> + + <JLabel id='nobinding1' text='{file.getAbsolutePath()}'/> + <JLabel id='nobinding2' text='{getFile().getAbsolutePath()}'/> + + <JLabel id='binding0' text='{file2.getAbsolutePath()}' javaBean='new JLabel()'/> + <JLabel id='binding1' text='{this.getFile2().getAbsolutePath()}'/> + <JLabel id='binding2' text='{getFile2().getAbsolutePath()}'/> + <JLabel id='binding3' text='{bean.getText()}'/> + <JLabel id='binding4' text='{getBean().getText()}'/> + <JLabel id='binding5' text='{beanImpl.getText()}'/> + <JLabel id='binding6' text='{getBeanImpl().getText()}'/> + <JLabel id='binding7' text='{binding0.getText()}'/> + <JLabel id='binding8' text='{getBinding0().getText()}'/> + <JLabel id='binding9' text='{binding0.getText() + binding1.getText()}'/> + +</JPanel> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/simpleBinding.xml similarity index 77% copy from maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml copy to maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/simpleBinding.xml index 042f3b2..b7db2a5 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Bug1722Test/Bug_1722.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DataBindingTest/simpleBinding.xml @@ -13,12 +13,11 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> - <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <force>true</force> <!--<verbose>true</verbose>--> <includes> - <value>**/Bug1722Test/*.jaxx</value> + <value>**/DataBindingTest/*.jaxx</value> </includes> </configuration> </plugin> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/Decorator.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/Decorator.xml index 52fdd43..f05698e 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/Decorator.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/DecoratorTest/Decorator.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <addLogger>false</addLogger> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml index 8209e9f..788ca89 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/error.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <!--<verbose>true</verbose>--> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml index 48d70c1..8f1bc87 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/Evolution74Test/ok.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <includes> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nText.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nText.xml index 2c5c9cf..c292cb6 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nText.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nText.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <i18nable>true</i18nable> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml index dd8358b..ad744a6 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nTitle.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <i18nable>true</i18nable> diff --git a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nToolTipText.xml b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nToolTipText.xml index 56b03e8..441f7a3 100644 --- a/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nToolTipText.xml +++ b/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/I18nTest/I18nToolTipText.xml @@ -13,7 +13,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> - <outJava>${basedir}/target/it-generated-sources/java</outJava> + <outJava>${basedir}/target/generated-sources/test-java</outJava> <!--outResource>${basedir}/target/it-generated-sources/resources</outResource--> <force>true</force> <i18nable>true</i18nable> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.