This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit a877e40db37e7c1a70d3301ce9924416e6751cb9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Oct 8 14:42:12 2016 +0200 Use now only tag values (See #4043) --- .../templates/EntityHibernateMappingGenerator.java | 4 +- .../nuiton/topia/templates/EntityTransformer.java | 3 +- .../topia/templates/TopiaCoreStereoTypes.java | 138 --------------------- .../nuiton/topia/templates/TopiaCoreTagValues.java | 47 +++++++ .../nuiton/topia/templates/TopiaGeneratorUtil.java | 16 +-- .../nuiton/topia/templates/TopiaStereoTypes.java | 14 +-- .../topia/templates/TopiaTemplateHelper.java | 18 +-- ...stereotype.provider.StereotypeMetadatasProvider | 1 - .../topia/templates/TopiaCoreStereoTypesTest.java | 69 ----------- .../topia/templates/TopiaCoreTagValuesTest.java | 12 +- 10 files changed, 86 insertions(+), 236 deletions(-) diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java index 6598415..65f66c2 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java @@ -28,7 +28,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.EugeneCoreStereotypes; +import org.nuiton.eugene.EugeneCoreTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.object.ObjectModel; @@ -585,7 +585,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { generateFromTagValue(optionalAttributesMap, HIBERNATE_ATTRIBUTE_INDEX, indexName); } - if (EugeneCoreStereotypes.hasUniqueStereotype(attr)) { + if (EugeneCoreTagValues.isUnique(attr)) { generateFromTagValue(optionalAttributesMap, HIBERNATE_ATTRIBUTE_UNIQUE, "true"); } diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java index 8992fc7..c86a4f2 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java @@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.EugeneCoreStereotypes; import org.nuiton.eugene.EugeneCoreTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; @@ -756,7 +755,7 @@ public class EntityTransformer extends ObjectModelTransformerToJava { GeneratorUtil.getSimpleName(collectionImpl); boolean ordered = JavaGeneratorUtil.isOrdered(attribute); - boolean unique = EugeneCoreStereotypes.hasUniqueStereotype(attribute); + boolean unique = EugeneCoreTagValues.isUnique(attribute); boolean entity = templateHelper.isEntity(attribute, model); // addXXX diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaCoreStereoTypes.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaCoreStereoTypes.java deleted file mode 100644 index 8195382..0000000 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaCoreStereoTypes.java +++ /dev/null @@ -1,138 +0,0 @@ -package org.nuiton.topia.templates; - -/* - * #%L - * ToPIA :: Templates - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2014 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.ImmutableSet; -import org.nuiton.eugene.models.extension.stereotype.StereotypeMetadata; -import org.nuiton.eugene.models.extension.stereotype.StereotypeUtil; -import org.nuiton.eugene.models.extension.stereotype.provider.DefaultStereotypeMetadatasProvider; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelPackage; - -import java.util.Set; - -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - -/** - * All extra stereotypes usable in topia generators. - * - * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.models.extension.stereotype.provider.StereotypeMetadatasProvider" role-hint="topia-core" - * @since 2.5 - */ -public class TopiaCoreStereoTypes extends DefaultStereotypeMetadatasProvider { - - @Override - public String getDescription() { - return t("topia.stereotypes"); - } - - public enum Store implements StereotypeMetadata { - - /** - * Stéréotype pour les objets devant être générées sous forme d'entités - * - * @see TopiaTemplateHelper#isEntity(ObjectModelClassifier) - * @see #hasEntityStereotype(ObjectModelClassifier , ObjectModelPackage) - */ - entity(n("topia.stereotypes.entity"), false, ObjectModelPackage.class, ObjectModelClassifier.class), - /** - * Stéréotype pour les attributs étant des clés primaires. - * - * @see #hasPrimaryKeyStereotype(ObjectModelAttribute) - * @deprecated since 3.0, use nowhere in ToPIA - */ - primaryKey(n("topia.stereotypes.primaryKey"), true, ObjectModelAttribute.class); - - private final Set<Class<?>> targets; - private final String i18nDescriptionKey; - private final boolean deprecated; - - Store(String i18nDescriptionKey, boolean deprecated, Class<?>... targets) { - this.deprecated=deprecated; - this.targets = ImmutableSet.copyOf(targets); - this.i18nDescriptionKey = i18nDescriptionKey; - } - - @Override - public String getName() { - return name(); - } - - @Override - public Set<Class<?>> getTargets() { - return targets; - } - - @Override - public String getDescription() { - return t(i18nDescriptionKey); - } - - @Override - public boolean isDeprecated() { - return deprecated; - } - - } - - public TopiaCoreStereoTypes() { - super((StereotypeMetadata[]) Store.values()); - } - - /** - * Check if the given classifier has the {@link Store#entity} stereotype. - * - * @param aPackage FIXME - * @param classifier classifier to test - * @return {@code true} if stereotype was found, {@code false otherwise} - * @see Store#entity - * - * @since 2.5 - */ - public static boolean hasEntityStereotype(ObjectModelClassifier classifier, ObjectModelPackage aPackage) { - boolean hasStereotype = StereotypeUtil.findDirectStereotype(Store.entity, classifier); - if (!hasStereotype && aPackage!=null) { - hasStereotype = StereotypeUtil.findDirectStereotype(Store.entity, aPackage); - } - return hasStereotype; - } - - /** - * Check if the given attribute has the {@link Store#primaryKey} stereotype. - * - * @param attribute attribute to test - * @return {@code true} if stereotype was found, {@code false otherwise} - * @see Store#primaryKey - * @since 2.5 - * @deprecated since 3.0, not used in ToPIA - */ - @Deprecated - public static boolean hasPrimaryKeyStereotype(ObjectModelAttribute attribute) { - return StereotypeUtil.findDirectStereotype(Store.primaryKey, attribute); - } -} diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaCoreTagValues.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaCoreTagValues.java index 56bb155..44a940f 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaCoreTagValues.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaCoreTagValues.java @@ -60,6 +60,21 @@ public class TopiaCoreTagValues extends DefaultTagValueMetadatasProvider { public enum Store implements TagValueMetadata { /** + * Stéréotype pour les objets devant être générées sous forme d'entités + * + * @see TopiaTemplateHelper#isEntity(ObjectModelClassifier) + * @see #isEntity(ObjectModelClassifier , ObjectModelPackage) + */ + entity(n("topia.stereotypes.entity"), boolean.class, null, ObjectModelPackage.class, ObjectModelClassifier.class), + /** + * Stéréotype pour les attributs étant des clés primaires. + * + * @see #isPrimaryKey(ObjectModelAttribute) + * @deprecated since 3.0, use nowhere in ToPIA + */ + primaryKey(n("topia.stereotypes.primaryKey"), boolean.class, null, ObjectModelAttribute.class), + + /** * Tag pour que les entités etendent {@link TopiaEntityContextable} et * se fasse injecter le {@link TopiaDaoSupplier} par rapport aux autres * entités qui ne l'ont pas. @@ -356,6 +371,38 @@ public class TopiaCoreTagValues extends DefaultTagValueMetadatasProvider { return TagValueUtil.findBooleanTagValue(Store.generatePropertyChangeSupport, clazz, modelPackage, model); } + /** + * Check if the given classifier has the {@link Store#entity} stereotype. + * + * @param aPackage FIXME + * @param classifier classifier to test + * @return {@code true} if stereotype was found, {@code false otherwise} + * @see Store#entity + * + * @since 2.5 + */ + public boolean isEntity(ObjectModelClassifier classifier, ObjectModelPackage aPackage) { + boolean hasStereotype = TagValueUtil.findBooleanTagValue(Store.entity, classifier); + if (!hasStereotype && aPackage!=null) { + hasStereotype = TagValueUtil.findBooleanTagValue(Store.entity, aPackage); + } + return hasStereotype; + } + + /** + * Check if the given attribute has the {@link Store#primaryKey} stereotype. + * + * @param attribute attribute to test + * @return {@code true} if stereotype was found, {@code false otherwise} + * @see Store#primaryKey + * @since 2.5 + * @deprecated since 3.0, not used in ToPIA + */ + @Deprecated + public boolean isPrimaryKey(ObjectModelAttribute attribute) { + return TagValueUtil.findBooleanTagValue(Store.primaryKey, attribute); + } + public String getDeprecatedModelTagValueMessage(ObjectModel model, String deprecatedTagValue, String newTagValue, diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java index 8593dfd..5d7c6ae 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java @@ -32,7 +32,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractGenerator; -import org.nuiton.eugene.EugeneCoreStereotypes; +import org.nuiton.eugene.EugeneCoreTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; @@ -553,7 +553,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { ObjectModelAttribute attr) { if (JavaGeneratorUtil.isOrdered(attr)) { return "list"; - } else if (EugeneCoreStereotypes.hasUniqueStereotype(attr)) { + } else if (EugeneCoreTagValues.isUnique(attr)) { return "set"; } //attr.isOrdered() - On génère le ordered en bag @@ -570,7 +570,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { */ public static List<ObjectModelClass> getEntityClasses(ObjectModel model, boolean sort) { - return getClassesByStereotype(TopiaCoreStereoTypes.Store.entity.getName(), model, sort); + return getClassesByStereotype(TopiaCoreTagValues.Store.entity.getName(), model, sort); } /** @@ -843,7 +843,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { * @param model model containing the attribute * @return {@code true} if type of attribute is an entity, * {@code false} otherwise - * @see TopiaCoreStereoTypes.Store#entity + * @see TopiaCoreTagValues.Store#entity * @since 2.7 */ public static boolean isEntity(ObjectModelAttribute attribute, @@ -859,16 +859,16 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Check if the given classifier has the - * {@link TopiaCoreStereoTypes.Store#entity} and is not an enumeration + * {@link TopiaCoreTagValues.Store#entity} and is not an enumeration * * @param classifier classifier to test * @return {@code true} if stereotype was found and classifier is not * enumeration, {@code false} otherwise - * @see TopiaCoreStereoTypes.Store#entity + * @see TopiaCoreTagValues.Store#entity * @since 2.5 */ public static boolean isEntity(ObjectModelClassifier classifier) { - return TopiaCoreStereoTypes.hasEntityStereotype(classifier, null) && !classifier.isEnum(); + return TOPIA_TAG_VALUES.isEntity(classifier, null) && !classifier.isEnum(); } /** @@ -943,7 +943,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { ObjectModelClass clazz, boolean includeName) { Collection<ObjectModelAttribute> attributeCollection; attributeCollection = getElementsWithStereotype(clazz.getAttributes(), - TopiaCoreStereoTypes.Store.primaryKey.getName()); + TopiaCoreTagValues.Store.primaryKey.getName()); List<String> attributes = Lists.newArrayList(); for (ObjectModelAttribute attr : attributeCollection) { String attribute = attr.getType(); diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaStereoTypes.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaStereoTypes.java index 706840f..52ed9e1 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaStereoTypes.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaStereoTypes.java @@ -62,33 +62,33 @@ public class TopiaStereoTypes extends StereotypeDefinitionProvider { public static final String STEREOTYPE_PRIMARY_KEY = "primaryKey"; /** - * Check if the given classifier has the {@link TopiaCoreStereoTypes.Store#entity} stereotype. + * Check if the given classifier has the {@link #STEREOTYPE_ENTITY} stereotype. * * @param aPackage FIXME * @param classifier classifier to test * @return {@code true} if stereotype was found, {@code false otherwise} - * @see TopiaCoreStereoTypes.Store#entity + * @see #STEREOTYPE_ENTITY * @since 2.5 */ public static boolean hasEntityStereotype(ObjectModelClassifier classifier, ObjectModelPackage aPackage) { - boolean hasStereotype = classifier.hasStereotype(TopiaCoreStereoTypes.Store.entity.getName()); + boolean hasStereotype = classifier.hasStereotype(STEREOTYPE_ENTITY); if (!hasStereotype && aPackage!=null) { - hasStereotype = aPackage.hasStereotype(TopiaCoreStereoTypes.Store.entity.getName()); + hasStereotype = aPackage.hasStereotype(STEREOTYPE_ENTITY); } return hasStereotype; } /** - * Check if the given attribute has the {@link TopiaCoreStereoTypes.Store#primaryKey} stereotype. + * Check if the given attribute has the {@link #STEREOTYPE_PRIMARY_KEY} stereotype. * * @param attribute attribute to test * @return {@code true} if stereotype was found, {@code false otherwise} - * @see TopiaCoreStereoTypes.Store#primaryKey + * @see #STEREOTYPE_PRIMARY_KEY * @since 2.5 * @deprecated since 3.0, not used in ToPIA */ @Deprecated public static boolean hasPrimaryKeyStereotype(ObjectModelAttribute attribute) { - return attribute.hasStereotype(TopiaCoreStereoTypes.Store.primaryKey.getName()); + return attribute.hasStereotype(STEREOTYPE_PRIMARY_KEY); } } diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTemplateHelper.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTemplateHelper.java index 281d28e..612fd57 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTemplateHelper.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTemplateHelper.java @@ -30,7 +30,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractGenerator; -import org.nuiton.eugene.EugeneCoreStereotypes; +import org.nuiton.eugene.EugeneCoreTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; @@ -94,11 +94,13 @@ public class TopiaTemplateHelper { protected final ObjectModel model; + protected final EugeneCoreTagValues eugeneTagValues; protected final TopiaCoreTagValues topiaCoreTagValues; protected final TopiaHibernateTagValues topiaHibernateTagValues; public TopiaTemplateHelper(ObjectModel model) { this.model = model; + this.eugeneTagValues = new EugeneCoreTagValues(); this.topiaCoreTagValues = new TopiaCoreTagValues(); this.topiaHibernateTagValues = new TopiaHibernateTagValues(); } @@ -593,7 +595,7 @@ public class TopiaTemplateHelper { ObjectModelAttribute attr) { if (JavaGeneratorUtil.isOrdered(attr)) { return "list"; - } else if (EugeneCoreStereotypes.hasUniqueStereotype(attr)) { + } else if (EugeneCoreTagValues.isUnique(attr)) { return "set"; } //attr.isOrdered() - On génère le ordered en bag @@ -868,7 +870,7 @@ public class TopiaTemplateHelper { * @param model model containing the attribute * @return {@code true} if type of attribute is an entity, * {@code false} otherwise - * @see TopiaCoreStereoTypes.Store#entity + * @see TopiaCoreTagValues.Store#entity * @since 2.7 */ public boolean isEntity(ObjectModelAttribute attribute, @@ -884,17 +886,17 @@ public class TopiaTemplateHelper { /** * Check if the given classifier has the - * {@link TopiaCoreStereoTypes.Store#entity} and is not an enumeration + * {@link TopiaCoreTagValues.Store#entity} and is not an enumeration * * @param classifier classifier to test * @return {@code true} if stereotype was found and classifier is not * enumeration, {@code false} otherwise - * @see TopiaCoreStereoTypes.Store#entity + * @see TopiaCoreTagValues.Store#entity * @since 2.5 */ public boolean isEntity(ObjectModelClassifier classifier) { ObjectModelPackage aPackage = model.getPackage(classifier); - return !classifier.isEnum() && TopiaCoreStereoTypes.hasEntityStereotype(classifier, aPackage); + return !classifier.isEnum() && topiaCoreTagValues.isEntity(classifier, aPackage); } /** @@ -934,8 +936,8 @@ public class TopiaTemplateHelper { public Class<?> getCollectionInstanceType(ObjectModelAttribute attribute) { - boolean unique = EugeneCoreStereotypes.hasUniqueStereotype(attribute); - boolean ordered = EugeneCoreStereotypes.hasOrderedStereotype(attribute); + boolean unique = EugeneCoreTagValues.isUnique(attribute); + boolean ordered = EugeneCoreTagValues.isOrdered(attribute); boolean orderBy = topiaHibernateTagValues.getOrderByTagValue(attribute) != null; Class<?> result; diff --git a/topia-templates/src/main/resources/META-INF/services/org.nuiton.eugene.models.extension.stereotype.provider.StereotypeMetadatasProvider b/topia-templates/src/main/resources/META-INF/services/org.nuiton.eugene.models.extension.stereotype.provider.StereotypeMetadatasProvider deleted file mode 100644 index f6e805a..0000000 --- a/topia-templates/src/main/resources/META-INF/services/org.nuiton.eugene.models.extension.stereotype.provider.StereotypeMetadatasProvider +++ /dev/null @@ -1 +0,0 @@ -org.nuiton.topia.templates.TopiaCoreStereoTypes \ No newline at end of file diff --git a/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreStereoTypesTest.java b/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreStereoTypesTest.java deleted file mode 100644 index 8350ba4..0000000 --- a/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreStereoTypesTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.nuiton.topia.templates; - -/* - * #%L - * ToPIA :: Templates - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2014 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.nuiton.eugene.models.extension.stereotype.MismatchStereotypeTargetException; -import org.nuiton.eugene.models.extension.stereotype.StereotypeNotFoundException; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelPackage; - -public class TopiaCoreStereoTypesTest { - - protected TopiaCoreStereoTypes provider; - - @Before - public void setUp() throws Exception { - provider = new TopiaCoreStereoTypes(); - } - - @Test - public void test() { - - validate(TopiaCoreStereoTypes.Store.entity.name(), true, ObjectModelPackage.class, ObjectModelClassifier.class); - validate(TopiaCoreStereoTypes.Store.entity.name(), false, ObjectModel.class, ObjectModelAttribute.class); - - validate(TopiaCoreStereoTypes.Store.entity.name() + System.nanoTime(), false, ObjectModelPackage.class, ObjectModelClassifier.class); - - } - - protected void validate(String name, boolean expected, Class<?>... types) { - for (Class<?> type : types) { - try { - provider.validate(name, type); - Assert.assertTrue(expected); - } catch (StereotypeNotFoundException e) { - Assert.assertFalse(expected); - } catch (MismatchStereotypeTargetException e) { - Assert.assertFalse(expected); - } - } - } - -} \ No newline at end of file diff --git a/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreTagValuesTest.java b/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreTagValuesTest.java index 310ec90..b4d960e 100644 --- a/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreTagValuesTest.java +++ b/topia-templates/src/test/java/org/nuiton/topia/templates/TopiaCoreTagValuesTest.java @@ -29,6 +29,10 @@ import org.junit.Before; import org.junit.Test; import org.nuiton.eugene.models.extension.tagvalue.MismatchTagValueTargetException; import org.nuiton.eugene.models.extension.tagvalue.TagValueNotFoundException; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelPackage; import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImpl; @@ -45,7 +49,13 @@ public class TopiaCoreTagValuesTest { @Test public void testDefaultValues() { - Assert.assertEquals(true, provider.getNotGenerateToStringTagValue(new ObjectModelClassImpl(), new ObjectModelPackageImpl(), new ObjectModelImpl())); + + validate(TopiaCoreTagValues.Store.entity.name(), true, ObjectModelPackage.class, ObjectModelClassifier.class); + validate(TopiaCoreTagValues.Store.entity.name(), false, ObjectModel.class, ObjectModelAttribute.class); + + validate(TopiaCoreTagValues.Store.entity.name() + System.nanoTime(), false, ObjectModelPackage.class, ObjectModelClassifier.class); + + Assert.assertEquals(true, provider.getNotGenerateToStringTagValue(new ObjectModelClassImpl(), new ObjectModelPackageImpl(), new ObjectModelImpl())); } protected void validate(String name, boolean expected, Class<?>... types) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.