diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DynamicProperiesPlaceholderCreator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DynamicProperiesPlaceholderCreator.java
new file mode 100644
index 0000000000000000000000000000000000000000..45f217dbd7ce23973455f28bb2540116a8df73a4
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DynamicProperiesPlaceholderCreator.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.server.business.bo;
+
+import java.util.List;
+import java.util.Set;
+
+import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityProperty;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PropertyType;
+
+class DynamicProperiesPlaceholderCreator implements IDynamicProperiesPlaceholderCreator
+{
+ /**
+ * Adds "dynamic properties" to "properties to update" and appropriate "placeholder" values
+ * to "new properties".
+ */
+ public void addDynamicPropertiesPlaceholders(List<IEntityProperty> newProperties,
+ Set<String> propertiesToUpdate, Set<String> dynamicProperties)
+ {
+ propertiesToUpdate.addAll(dynamicProperties);
+ for (String dp : dynamicProperties)
+ {
+ final IEntityProperty entityProperty = new EntityProperty();
+ entityProperty.setValue(BasicConstant.PLACEHOLDER_PROPERTY_VALUE);
+ PropertyType propertyType = new PropertyType();
+ propertyType.setCode(dp);
+ entityProperty.setPropertyType(propertyType);
+ newProperties.add(entityProperty);
+ }
+ }
+}
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DynamicPropertiesUpdateChecker.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DynamicPropertiesUpdateChecker.java
new file mode 100644
index 0000000000000000000000000000000000000000..6285512e059786bb20c25b1ca5757ce70129e458
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DynamicPropertiesUpdateChecker.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.server.business.bo;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+
+import ch.systemsx.cisd.common.exceptions.UserFailureException;
+
+class DynamicPropertiesUpdateChecker implements IDynamicPropertiesUpdateChecker
+{
+
+ public void checkDynamicPropertiesNotManuallyUpdated(Set<String> propertiesToUpdate,
+ Set<String> dynamicProperties)
+ {
+ HashSet<String> allPropertiesToUpdate = new HashSet<String>();
+ for (String p : propertiesToUpdate)
+ {
+ allPropertiesToUpdate.add(p.toUpperCase());
+ }
+ HashSet<String> dynamicPropertiesToUpdate = new HashSet<String>(dynamicProperties);
+ dynamicPropertiesToUpdate.retainAll(allPropertiesToUpdate);
+ if (dynamicPropertiesToUpdate.isEmpty() == false)
+ {
+ throw new UserFailureException(String.format(
+ "Dynamic properties cannot be updated manually [%s]",
+ StringUtils.join(dynamicPropertiesToUpdate, ",")));
+ }
+ }
+}
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverter.java
index 275a2baf4bbaf851a99828f438e15c7de8ee1b11..f3b525c6fa9e284bf17314cb1718ce5ac68d60ad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverter.java
@@ -25,8 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang.StringUtils;
-
import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.common.collections.IKeyExtractor;
import ch.systemsx.cisd.common.collections.TableMap;
@@ -35,12 +33,9 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IPropertyValueValidator;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.PropertyValidator;
import ch.systemsx.cisd.openbis.generic.server.util.KeyExtractorFactory;
-import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PropertyType;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityPropertyPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePropertyTypePE;
@@ -63,9 +58,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
*/
public final class EntityPropertiesConverter implements IEntityPropertiesConverter
{
- private static boolean CHECK_DYNAMIC_PROPERTIES_NOT_UPDATED_MANUALLY = false;
-
- private static boolean CREATE_DYNAMIC_PROPERTIES_PLACEHOLDERS = false;
private static final String NO_ENTITY_PROPERTY_VALUE_FOR_S =
"Value of mandatory property '%s' not specified.";
@@ -87,22 +79,32 @@ public final class EntityPropertiesConverter implements IEntityPropertiesConvert
private final IPropertyValueValidator propertyValueValidator;
+ private final IDynamicPropertiesUpdateChecker dynamicPropertiesUpdateChecker;
+
+ private final IDynamicProperiesPlaceholderCreator placeholderCreator;
+
public EntityPropertiesConverter(final EntityKind entityKind, final IDAOFactory daoFactory)
{
- this(entityKind, daoFactory, new PropertyValidator(daoFactory));
+ this(entityKind, daoFactory, new PropertyValidator(daoFactory),
+ new DynamicPropertiesUpdateChecker(), new DynamicProperiesPlaceholderCreator());
}
@Private
EntityPropertiesConverter(final EntityKind entityKind, final IDAOFactory daoFactory,
- final IPropertyValueValidator propertyValueValidator)
+ final IPropertyValueValidator propertyValueValidator,
+ IDynamicPropertiesUpdateChecker dynamicPropertiesUpdateChecker,
+ IDynamicProperiesPlaceholderCreator placeholderCreator)
{
assert entityKind != null : "Unspecified entity kind.";
assert daoFactory != null : "Unspecified DAO factory.";
assert propertyValueValidator != null : "Unspecified property value validator.";
+ assert dynamicPropertiesUpdateChecker != null : "Unspecified dynamic properties update checker.";
this.daoFactory = daoFactory;
this.entityKind = entityKind;
this.propertyValueValidator = propertyValueValidator;
+ this.dynamicPropertiesUpdateChecker = dynamicPropertiesUpdateChecker;
+ this.placeholderCreator = placeholderCreator;
}
private final Set<String> getDynamicProperties(final EntityTypePE entityTypePE)
@@ -283,10 +285,12 @@ public final class EntityPropertiesConverter implements IEntityPropertiesConvert
final EntityTypePE entityTypePE = getEntityType(entityTypeCode);
Set<String> dynamicProperties = getDynamicProperties(entityTypePE);
Set<String> propertiesToUpdate = extractPropertiesToUpdate(properties);
- checkDynamicPropertiesNotManuallyUpdated(propertiesToUpdate, dynamicProperties);
+ dynamicPropertiesUpdateChecker.checkDynamicPropertiesNotManuallyUpdated(propertiesToUpdate,
+ dynamicProperties);
List<IEntityProperty> newProperties =
new ArrayList<IEntityProperty>(Arrays.asList(properties));
- addDynamicPropertiesPlaceholders(newProperties, propertiesToUpdate, dynamicProperties);
+ placeholderCreator.addDynamicPropertiesPlaceholders(newProperties, propertiesToUpdate,
+ dynamicProperties);
final List<T> list = new ArrayList<T>();
for (final IEntityProperty property : newProperties)
{
@@ -397,9 +401,6 @@ public final class EntityPropertiesConverter implements IEntityPropertiesConvert
EntityTypePE entityType, List<IEntityProperty> newProperties, PersonPE registrator,
Set<String> dynamicProperties)
{
- Set<String> propertiesToUpdate = extractPropertiesToUpdate(newProperties);
- checkDynamicPropertiesNotManuallyUpdated(propertiesToUpdate, dynamicProperties);
- addDynamicPropertiesPlaceholders(newProperties, propertiesToUpdate, dynamicProperties);
final List<T> convertedProperties =
convertProperties(newProperties, entityType.getCode(), registrator);
final Set<T> set = new HashSet<T>();
@@ -419,22 +420,10 @@ public final class EntityPropertiesConverter implements IEntityPropertiesConvert
return set;
}
- private <P extends IEntityProperty> Set<String> extractPropertiesToUpdate(List<P> newProperties)
- {
- Set<String> propertiesToUpdate = new HashSet<String>();
- for (P np : newProperties)
- {
- propertiesToUpdate.add(np.getPropertyType().getCode());
- }
- return propertiesToUpdate;
- }
-
public <T extends EntityPropertyPE> Set<T> updateProperties(Collection<T> oldProperties,
EntityTypePE entityType, List<IEntityProperty> newProperties, PersonPE registrator,
Set<String> propertiesToUpdate, Set<String> dynamicProperties)
{
- checkDynamicPropertiesNotManuallyUpdated(propertiesToUpdate, dynamicProperties);
- addDynamicPropertiesPlaceholders(newProperties, propertiesToUpdate, dynamicProperties);
// all new properties should be among propertiesToUpdate (no need to check it)
final Set<T> set =
updateProperties(oldProperties, entityType, newProperties, registrator,
@@ -452,45 +441,6 @@ public final class EntityPropertiesConverter implements IEntityPropertiesConvert
return set;
}
- private void addDynamicPropertiesPlaceholders(List<IEntityProperty> newProperties,
- Set<String> propertiesToUpdate, Set<String> dynamicProperties)
- {
- if (CREATE_DYNAMIC_PROPERTIES_PLACEHOLDERS)
- {
- propertiesToUpdate.addAll(dynamicProperties);
- for (String dp : dynamicProperties)
- {
- final IEntityProperty entityProperty = new EntityProperty();
- entityProperty.setValue(BasicConstant.PLACEHOLDER_PROPERTY_VALUE);
- PropertyType propertyType = new PropertyType();
- propertyType.setCode(dp);
- entityProperty.setPropertyType(propertyType);
- newProperties.add(entityProperty);
- }
- }
- }
-
- private void checkDynamicPropertiesNotManuallyUpdated(Set<String> propertiesToUpdate,
- Set<String> dynamicProperties)
- {
- if (CHECK_DYNAMIC_PROPERTIES_NOT_UPDATED_MANUALLY)
- {
- HashSet<String> allPropertiesToUpdate = new HashSet<String>();
- for (String p : propertiesToUpdate)
- {
- allPropertiesToUpdate.add(p.toUpperCase());
- }
- HashSet<String> dynamicPropertiesToUpdate = new HashSet<String>(dynamicProperties);
- dynamicPropertiesToUpdate.retainAll(allPropertiesToUpdate);
- if (dynamicPropertiesToUpdate.isEmpty() == false)
- {
- throw new UserFailureException(String.format(
- "Dynamic properties cannot be updated manually [%s]",
- StringUtils.join(dynamicPropertiesToUpdate, ",")));
- }
- }
- }
-
private static <T extends EntityPropertyPE> T tryFind(Collection<T> oldProperties, T p)
{
for (T oldProperty : oldProperties)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicProperiesPlaceholderCreator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicProperiesPlaceholderCreator.java
new file mode 100644
index 0000000000000000000000000000000000000000..47b5a0719fe72706a83a81e01143fac7dd0d45c6
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicProperiesPlaceholderCreator.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.server.business.bo;
+
+import java.util.List;
+import java.util.Set;
+
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
+
+interface IDynamicProperiesPlaceholderCreator
+{
+ void addDynamicPropertiesPlaceholders(List<IEntityProperty> newProperties,
+ Set<String> propertiesToUpdate, Set<String> dynamicProperties);
+}
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicPropertiesUpdateChecker.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicPropertiesUpdateChecker.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc6240c50fb9dd8cd36d1d189c8be0d661c5867c
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicPropertiesUpdateChecker.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2010 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.server.business.bo;
+
+import java.util.Set;
+
+interface IDynamicPropertiesUpdateChecker
+{
+ void checkDynamicPropertiesNotManuallyUpdated(Set<String> propertiesToUpdate,
+ Set<String> dynamicProperties);
+}
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
index 49c5c7f2d3e551a2204d91e105f06f4098745384..2d6aa8d426ff7da64ac7dfbb83a26ec77e5d71fa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
@@ -165,7 +165,8 @@ abstract public class PropertiesEditor<T extends EntityType, S extends EntityTyp
Object value = field.get().getValue();
final S etpt = field.get().getData(ETPT); // null for section labels
- if (etpt != null && value != null && PropertyFieldFactory.valueToString(value) != null)
+ if (etpt != null && value != null && PropertyFieldFactory.valueToString(value) != null
+ && (etpt.isDynamic() == false))
{
final IEntityProperty entityProperty = createEntityProperty();
entityProperty.setValue(PropertyFieldFactory.valueToString(value));
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CollectionMatcher.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CollectionMatcher.java
new file mode 100644
index 0000000000000000000000000000000000000000..ec99082e47f1cb204ba77d84fb5f9759979eb51b
--- /dev/null
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CollectionMatcher.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2010 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2008 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.server.business.bo;
+
+import java.util.Collection;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+
+/**
+ * @author Izabela Adamczyk
+ */
+public final class CollectionMatcher<C extends Collection<?>> extends BaseMatcher<C>
+{
+ private final C expected;
+
+ public CollectionMatcher(final C expected)
+ {
+ this.expected = expected;
+ }
+
+ public boolean matches(Object item)
+ {
+ if (expected == item)
+ {
+ return true;
+ }
+ if (expected == null && item != null || expected != null && item == null)
+ {
+ return false;
+ }
+ @SuppressWarnings("unchecked")
+ C set = (C) item;
+ if (set.size() != expected.size())
+ {
+ return false;
+ }
+ for (Object s : expected)
+ {
+ if (set.contains(s) == false)
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public void describeTo(Description description)
+ {
+ description.appendValue(expected);
+ }
+}
\ No newline at end of file
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverterTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverterTest.java
index d2582b72be62b35b820e21cd9e8f8eb41e986ce2..af56f5ded6101fb7ad217a34b434bde78e8db3db 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverterTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverterTest.java
@@ -16,8 +16,12 @@
package ch.systemsx.cisd.openbis.generic.server.business.bo;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.jmock.Expectations;
import org.testng.annotations.BeforeMethod;
@@ -55,18 +59,26 @@ public final class EntityPropertiesConverterTest extends AbstractBOTest
private IPropertyValueValidator propertyValueValidator;
+ private IDynamicPropertiesUpdateChecker dynamicPropertiesChecker;
+
+ private IDynamicProperiesPlaceholderCreator placeholderCreator;
+
@Override
@BeforeMethod
public final void beforeMethod()
{
super.beforeMethod();
propertyValueValidator = context.mock(IPropertyValueValidator.class);
+ dynamicPropertiesChecker = context.mock(IDynamicPropertiesUpdateChecker.class);
+ placeholderCreator = context.mock(IDynamicProperiesPlaceholderCreator.class);
+
}
private final IEntityPropertiesConverter createEntityPropertiesConverter(
final EntityKind entityKind)
{
- return new EntityPropertiesConverter(entityKind, daoFactory, propertyValueValidator);
+ return new EntityPropertiesConverter(entityKind, daoFactory, propertyValueValidator,
+ dynamicPropertiesChecker, placeholderCreator);
}
private void prepareForConvertion(final Expectations exp)
@@ -160,6 +172,20 @@ public final class EntityPropertiesConverterTest extends AbstractBOTest
{
{
prepareForConvertion(this);
+ CollectionMatcher<Set<String>> propertiesToUpdateMatcher =
+ new CollectionMatcher<Set<String>>(new HashSet<String>());
+ CollectionMatcher<Set<String>> dynamicPropertiesMatcher =
+ new CollectionMatcher<Set<String>>(new HashSet<String>(
+ new ArrayList<String>()));
+ one(dynamicPropertiesChecker).checkDynamicPropertiesNotManuallyUpdated(
+ with(propertiesToUpdateMatcher), with(dynamicPropertiesMatcher));
+
+ CollectionMatcher<List<IEntityProperty>> newPropertiesMatcher =
+ new CollectionMatcher<List<IEntityProperty>>(
+ new ArrayList<IEntityProperty>());
+ one(placeholderCreator).addDynamicPropertiesPlaceholders(
+ with(newPropertiesMatcher), with(propertiesToUpdateMatcher),
+ with(dynamicPropertiesMatcher));
}
});
final List<EntityPropertyPE> properties =
@@ -175,18 +201,58 @@ public final class EntityPropertiesConverterTest extends AbstractBOTest
final IEntityPropertiesConverter entityPropertiesConverter =
createEntityPropertiesConverter(EntityKind.SAMPLE);
final PropertyTypePE propertyTypePE = createPropertyType();
+ final IEntityProperty[] properties = createSampleProperties(false);
context.checking(new Expectations()
{
{
- prepareForConvertion(this);
+
+ final SampleTypePE sampleType = createSampleType(SAMPLE_TYPE_CODE);
+ final SampleTypePropertyTypePE sampleTypePropertyTypePE =
+ createETPT(VARCHAR_PROPERTY_TYPE_CODE, false, sampleType);
+
+ this.allowing(daoFactory).getEntityPropertyTypeDAO(EntityKind.SAMPLE);
+ this.will(Expectations.returnValue(entityPropertyTypeDAO));
+
+ this.allowing(daoFactory).getEntityTypeDAO(EntityKind.SAMPLE);
+ this.will(Expectations.returnValue(entityTypeDAO));
+
+ this.allowing(daoFactory).getPropertyTypeDAO();
+ this.will(Expectations.returnValue(propertyTypeDAO));
+
+ this.atLeast(1).of(entityTypeDAO).listEntityTypes();
+ this.will(Expectations.returnValue(Collections.singletonList(sampleType)));
+
+ this.allowing(entityPropertyTypeDAO).listEntityPropertyTypes(sampleType);
+ this.will(Expectations.returnValue(Collections
+ .singletonList(sampleTypePropertyTypePE)));
one(propertyTypeDAO).tryFindPropertyTypeByCode(VARCHAR_PROPERTY_TYPE_CODE);
will(returnValue(propertyTypePE));
one(propertyValueValidator).validatePropertyValue(propertyTypePE, "blue");
+
+ CollectionMatcher<Set<String>> propertiesToUpdateMatcher =
+ new CollectionMatcher<Set<String>>(new HashSet<String>(Arrays
+ .asList(VARCHAR_PROPERTY_TYPE_CODE)));
+ CollectionMatcher<Set<String>> dynamicPropertiesMatcher =
+ new CollectionMatcher<Set<String>>(new HashSet<String>(
+ new ArrayList<String>()));
+ one(dynamicPropertiesChecker).checkDynamicPropertiesNotManuallyUpdated(
+ with(propertiesToUpdateMatcher), with(dynamicPropertiesMatcher));
+
+ ArrayList<IEntityProperty> listOfProperties = new ArrayList<IEntityProperty>();
+ for (IEntityProperty p : properties)
+ {
+ listOfProperties.add(p);
+ }
+ CollectionMatcher<List<IEntityProperty>> newPropertiesMatcher =
+ new CollectionMatcher<List<IEntityProperty>>(listOfProperties);
+ one(placeholderCreator).addDynamicPropertiesPlaceholders(
+ with(newPropertiesMatcher), with(propertiesToUpdateMatcher),
+ with(dynamicPropertiesMatcher));
}
+
});
- final IEntityProperty[] properties = createSampleProperties(false);
final List<EntityPropertyPE> convertedProperties =
entityPropertiesConverter.convertProperties(properties, SAMPLE_TYPE_CODE,
ManagerTestTool.EXAMPLE_PERSON);
@@ -194,12 +260,27 @@ public final class EntityPropertiesConverterTest extends AbstractBOTest
context.assertIsSatisfied();
}
+ private SampleTypePropertyTypePE createETPT(String code, boolean dynamic,
+ final SampleTypePE sampleType)
+ {
+ final SampleTypePropertyTypePE sampleTypePropertyTypePE = new SampleTypePropertyTypePE();
+ sampleTypePropertyTypePE.setEntityType(sampleType);
+
+ final PropertyTypePE propertyType = new PropertyTypePE();
+ propertyType.setCode(code);
+ sampleTypePropertyTypePE.setPropertyType(propertyType);
+ sampleTypePropertyTypePE.setMandatory(false);
+ sampleTypePropertyTypePE.setDynamic(dynamic);
+ return sampleTypePropertyTypePE;
+ }
+
@Test
public final void testConvertPropertiesWithLowerCase()
{
final IEntityPropertiesConverter entityPropertiesConverter =
createEntityPropertiesConverter(EntityKind.SAMPLE);
final PropertyTypePE propertyTypePE = createPropertyType();
+ final IEntityProperty[] properties = createSampleProperties(true);
context.checking(new Expectations()
{
{
@@ -209,12 +290,31 @@ public final class EntityPropertiesConverterTest extends AbstractBOTest
will(returnValue(propertyTypePE));
one(propertyValueValidator).validatePropertyValue(propertyTypePE, "blue");
+
+ CollectionMatcher<Set<String>> propertiesToUpdateMatcher =
+ new CollectionMatcher<Set<String>>(new HashSet<String>(Arrays
+ .asList(VARCHAR_PROPERTY_TYPE_CODE)));
+ CollectionMatcher<Set<String>> dynamicPropertiesMatcher =
+ new CollectionMatcher<Set<String>>(new HashSet<String>(
+ new ArrayList<String>()));
+ one(dynamicPropertiesChecker).checkDynamicPropertiesNotManuallyUpdated(
+ with(propertiesToUpdateMatcher), with(dynamicPropertiesMatcher));
+
+ ArrayList<IEntityProperty> listOfProperties = new ArrayList<IEntityProperty>();
+ for (IEntityProperty p : properties)
+ {
+ listOfProperties.add(p);
+ }
+ CollectionMatcher<List<IEntityProperty>> newPropertiesMatcher =
+ new CollectionMatcher<List<IEntityProperty>>(listOfProperties);
+ one(placeholderCreator).addDynamicPropertiesPlaceholders(
+ with(newPropertiesMatcher), with(propertiesToUpdateMatcher),
+ with(dynamicPropertiesMatcher));
}
});
- final IEntityProperty[] properties = createSampleProperties(true);
final List<EntityPropertyPE> convertedProperties =
- entityPropertiesConverter.convertProperties(properties, SAMPLE_TYPE_CODE
- .toLowerCase(), ManagerTestTool.EXAMPLE_PERSON);
+ entityPropertiesConverter.convertProperties(properties,
+ SAMPLE_TYPE_CODE.toLowerCase(), ManagerTestTool.EXAMPLE_PERSON);
assertEquals(1, convertedProperties.size());
context.assertIsSatisfied();
}
@@ -248,8 +348,10 @@ public final class EntityPropertiesConverterTest extends AbstractBOTest
});
entityPropertiesConverter.tryCreateValidatedPropertyValue(propertyType, assignment,
defaultValue);
- assertEquals(registrator, entityPropertiesConverter.createValidatedProperty(propertyType,
- assignment, registrator, defaultValue).getRegistrator());
+ assertEquals(
+ registrator,
+ entityPropertiesConverter.createValidatedProperty(propertyType, assignment,
+ registrator, defaultValue).getRegistrator());
context.assertIsSatisfied();
}
@@ -285,4 +387,5 @@ public final class EntityPropertiesConverterTest extends AbstractBOTest
assignment, defaultValue));
context.assertIsSatisfied();
}
+
}