Commit 571b923f authored by apupier's avatar apupier
Browse files

add modifed files from the merge

parent b7ba8146
......@@ -8710,8 +8710,8 @@
<changes xsi:type="history:Set" element="process.ecore#//Document/documentType"
featureName="defaultValueLiteral" dataValue="NONE" oldDataValue="0"/>
</changes>
</releases>
<releases date="2014-10-17T10:17:14.066+0200" label="6.4.0-003">
</releases>
<releases date="2014-10-28T10:45:10.092+0100" label="6.4.0-004">
<changes xsi:type="history:Create" target="form.ecore#/" referenceName="eClassifiers"
element="form.ecore#//FileWidgetDownloadType"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType"
......@@ -8719,32 +8719,32 @@
<changes xsi:type="history:Create" target="form.ecore#//FileWidgetDownloadType"
referenceName="eLiterals" element="form.ecore#//FileWidgetDownloadType/Both"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType/Both"
featureName="name" dataValue="All"/>
featureName="literal" dataValue="Both"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType/Both"
featureName="name" dataValue="Both"/>
<changes xsi:type="history:Create" target="form.ecore#//FileWidgetDownloadType"
referenceName="eLiterals" element="form.ecore#//FileWidgetDownloadType/URL"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType/URL"
featureName="value" dataValue="1" oldDataValue="0"/>
featureName="literal" dataValue="URL"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType/URL"
featureName="name" dataValue="URL"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType/URL"
featureName="value" dataValue="1" oldDataValue="0"/>
<changes xsi:type="history:Create" target="form.ecore#//FileWidgetDownloadType"
referenceName="eLiterals" element="form.ecore#//FileWidgetDownloadType/Browse"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType/Browse"
featureName="value" dataValue="2" oldDataValue="0"/>
featureName="literal" dataValue="Browse"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType/Browse"
featureName="name" dataValue="Browse"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType/Both"
featureName="name" dataValue="Both" oldDataValue="All"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidgetDownloadType/Browse"
featureName="value" dataValue="2" oldDataValue="0"/>
<changes xsi:type="history:Create" target="form.ecore#//FileWidget" referenceName="eStructuralFeatures"
element="form.ecore#//FileWidget/downloadType"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidget/downloadType"
featureName="name" dataValue="downloadType"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidget/downloadType"
featureName="defaultValueLiteral" dataValue=""/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidget/downloadType"
featureName="eType" referenceValue="form.ecore#//FileWidgetDownloadType"/>
<changes xsi:type="history:Set" element="form.ecore#//FileWidget/downloadType"
featureName="defaultValueLiteral" dataValue="Both" oldDataValue=""/>
<changes xsi:type="history:MigrationChange" migration="org.bonitasoft.studio.migration.custom.migration.form.FileWidgetResourceMigration"/>
<changes xsi:type="history:MigrationChange" migration="org.bonitasoft.studio.migration.custom.migration.form.FileWidgetDocumentMigration"/>
</releases>
<releases/>
</history:History>
......@@ -20,7 +20,7 @@ package org.bonitasoft.studio.common;
public class ModelVersion {
public static final String VERSION_6_0_0_ALPHA = "6.0.0-Alpha";
public static final String CURRENT_VERSION = "6.4.0-003";
public static final String CURRENT_VERSION = "6.4.0-004";
public static boolean sameVersion(final String version) {
return CURRENT_VERSION.equals(version);
......
......@@ -85,13 +85,6 @@ public class FormsExporterTest {
verify(formExporter).addAction(formBuilder,operation);
}
@Test
public void should_AddFileWidgetInputType_All() throws InvalidFormDefinitionException {
final FileWidget fileWidget = FileWidgetBuilder.create().withInputType(FileWidgetInputType.DOCUMENT).build();
formExporter.addDocumentInitialValue(fileWidget, formBuilder);
verify(formBuilder).addFileWidgetInputType(org.bonitasoft.forms.client.model.FileWidgetInputType.ALL);
}
@Test
public void should_addFileWidgetInitialValueExpression_whenTypeIsDocument() throws InvalidFormDefinitionException {
final FileWidget fileWidget = FileWidgetBuilder.create().withInputType(FileWidgetInputType.DOCUMENT).build();
......@@ -159,7 +152,7 @@ public class FormsExporterTest {
@Test
public void should_addDocumentInitialValue_WhenFileDocumentDownloadType_isURL() throws InvalidFormDefinitionException {
final FileWidget fileWidget = createFileWidget(FileWidgetInputType.DOCUMENT);
final FileWidget fileWidget = FileWidgetBuilder.create().withInputType(FileWidgetInputType.DOCUMENT).build();
fileWidget.setDuplicate(false);
fileWidget.setDownloadType(FileWidgetDownloadType.URL);
formExporter.addFileWidgetInputType(fileWidget, formBuilder);
......@@ -168,7 +161,7 @@ public class FormsExporterTest {
@Test
public void should_addDocumentInitialValue_WhenFileDocumentDownloadType_isBrowse() throws InvalidFormDefinitionException {
final FileWidget fileWidget = createFileWidget(FileWidgetInputType.DOCUMENT);
final FileWidget fileWidget = FileWidgetBuilder.create().withInputType(FileWidgetInputType.DOCUMENT).build();
fileWidget.setDuplicate(false);
fileWidget.setDownloadType(FileWidgetDownloadType.BROWSE);
formExporter.addFileWidgetInputType(fileWidget, formBuilder);
......@@ -177,7 +170,7 @@ public class FormsExporterTest {
@Test
public void should_addDocumentInitialValue_WhenFileDocumentDownloadType_isBoth() throws InvalidFormDefinitionException {
final FileWidget fileWidget = createFileWidget(FileWidgetInputType.DOCUMENT);
final FileWidget fileWidget = FileWidgetBuilder.create().withInputType(FileWidgetInputType.DOCUMENT).build();
fileWidget.setDuplicate(false);
fileWidget.setDownloadType(FileWidgetDownloadType.BOTH);
formExporter.addFileWidgetInputType(fileWidget, formBuilder);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment