This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit fddd5a0775a1339db58dee03982f3035bfbb75df Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 4 17:48:35 2016 +0200 Make repeatable test spi annotations --- .../observe/test/spi/CopyDatabaseConfiguration.java | 3 +++ ...figuration.java => CopyDatabaseConfigurations.java} | 6 +++--- .../fr/ird/observe/test/spi/DatabaseClassifier.java | 18 ++++++++++++++++++ .../observe/test/spi/DatabaseNameConfiguration.java | 5 +++++ ...figuration.java => DatabaseNameConfigurations.java} | 8 +++----- .../observe/test/spi/DatabaseVersionConfiguration.java | 3 +++ ...uration.java => DatabaseVersionConfigurations.java} | 5 ++--- 7 files changed, 37 insertions(+), 11 deletions(-) diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java index f63e548..7b8f4ec 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java @@ -1,6 +1,7 @@ package fr.ird.observe.test.spi; import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -12,6 +13,8 @@ import java.lang.annotation.Target; */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) +@Repeatable(CopyDatabaseConfigurations.class) public @interface CopyDatabaseConfiguration { + DatabaseClassifier classifier() default DatabaseClassifier.DEFAULT; } diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfigurations.java similarity index 74% copy from observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java copy to observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfigurations.java index f63e548..2e240a4 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfigurations.java @@ -6,12 +6,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Created on 26/12/15. + * Created on 04/07/16. * * @author Tony Chemit - chemit@codelutin.com */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) -public @interface CopyDatabaseConfiguration { - +public @interface CopyDatabaseConfigurations { + CopyDatabaseConfiguration[] value(); } diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseClassifier.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseClassifier.java new file mode 100644 index 0000000..bfcfccd --- /dev/null +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseClassifier.java @@ -0,0 +1,18 @@ +package fr.ird.observe.test.spi; + +/** + * Created on 04/07/16. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public enum DatabaseClassifier { + + /** + * classifier par défault (si aucun classifier n'est défini de manière explicite). + */ + DEFAULT, + /** + * classifier utilisé lors des tests de synchronisation où une seconde source de données est requies. + */ + CENTRAL +} diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java index 5d37dfe..95d9d1f 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java @@ -3,6 +3,7 @@ package fr.ird.observe.test.spi; import fr.ird.observe.test.DatabaseName; import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -14,8 +15,12 @@ import java.lang.annotation.Target; */ @Target(value = {ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) +@Repeatable(DatabaseNameConfigurations.class) public @interface DatabaseNameConfiguration { DatabaseName value() default DatabaseName.referentiel; + DatabaseClassifier classifier() default DatabaseClassifier.DEFAULT; + + } diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfigurations.java similarity index 75% copy from observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java copy to observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfigurations.java index 6bd1c9d..cb3a40f 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfigurations.java @@ -6,14 +6,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Created on 26/12/15. + * Created on 04/07/16. * * @author Tony Chemit - chemit@codelutin.com */ @Target(value = {ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) -public @interface DatabaseVersionConfiguration { - - String value() default ""; - +public @interface DatabaseNameConfigurations { + DatabaseNameConfiguration[] value(); } diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java index 6bd1c9d..f4bd8c5 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java @@ -1,6 +1,7 @@ package fr.ird.observe.test.spi; import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -12,8 +13,10 @@ import java.lang.annotation.Target; */ @Target(value = {ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) +@Repeatable(DatabaseVersionConfigurations.class) public @interface DatabaseVersionConfiguration { String value() default ""; + DatabaseClassifier classifier() default DatabaseClassifier.DEFAULT; } diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfigurations.java similarity index 79% copy from observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java copy to observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfigurations.java index 6bd1c9d..9a0ab09 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfigurations.java @@ -12,8 +12,7 @@ import java.lang.annotation.Target; */ @Target(value = {ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) -public @interface DatabaseVersionConfiguration { - - String value() default ""; +public @interface DatabaseVersionConfigurations { + DatabaseVersionConfiguration[] value(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.