From d4333c513f5b75d5ffb59ac6bd09552ca6a434af Mon Sep 17 00:00:00 2001 From: obfromevi Date: Thu, 24 Apr 2025 17:36:31 +0200 Subject: [PATCH] LUT-29928 : update unit tests --- .../plugins/forms/service/FormServiceTest.java | 13 ++++--------- .../plugins/forms/util/FormsEntryUtilsTest.java | 9 ++++++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/test/java/fr/paris/lutece/plugins/forms/service/FormServiceTest.java b/src/test/java/fr/paris/lutece/plugins/forms/service/FormServiceTest.java index e8ba01743..7d5d0ec63 100644 --- a/src/test/java/fr/paris/lutece/plugins/forms/service/FormServiceTest.java +++ b/src/test/java/fr/paris/lutece/plugins/forms/service/FormServiceTest.java @@ -59,6 +59,7 @@ import fr.paris.lutece.plugins.genericattributes.business.Entry; import fr.paris.lutece.plugins.genericattributes.business.EntryHome; import fr.paris.lutece.plugins.genericattributes.business.EntryType; +import fr.paris.lutece.plugins.genericattributes.business.EntryTypeHome; import fr.paris.lutece.plugins.genericattributes.business.Response; import fr.paris.lutece.plugins.genericattributes.business.ResponseHome; import fr.paris.lutece.portal.business.file.File; @@ -85,10 +86,6 @@ public class FormServiceTest extends LuteceTestCase { private static final String DEFAULT_QUESTION_CODE = "default_question_code"; private static final String DEFAULT_QUESTION_COLUMN_TITLE = "default_question_column_title"; - // Entry - private static final int ENTRY_TYPE_FILE_ID = 108; - private static final String ENTRY_TYPE_TITLE = "default_entry_type_title"; - // Entry type private static final String BEAN_NAME_ENTRY_TYPE_FILE = "forms.entryTypeFile"; @@ -226,14 +223,12 @@ private Step createStep( ) */ private Entry createEntry( ) { - EntryType entryTypeText = new EntryType( ); - entryTypeText.setIdType( ENTRY_TYPE_FILE_ID ); - entryTypeText.setTitle( ENTRY_TYPE_TITLE ); - entryTypeText.setBeanName( BEAN_NAME_ENTRY_TYPE_FILE ); + List entryTypes = EntryTypeHome.getCompleteList( ); + EntryType entryTypeFile = entryTypes.stream().filter( type -> BEAN_NAME_ENTRY_TYPE_FILE.equals( type.getBeanName( ) ) ).findFirst( ).orElse( null ); Entry entry = new Entry( ); entry.setIndexed( true ); - entry.setEntryType( entryTypeText ); + entry.setEntryType( entryTypeFile ); entry.setResourceType( RESOURCE_TYPE ); entry.setIdResource( _form.getId( ) ); diff --git a/src/test/java/fr/paris/lutece/plugins/forms/util/FormsEntryUtilsTest.java b/src/test/java/fr/paris/lutece/plugins/forms/util/FormsEntryUtilsTest.java index a2aadffa9..800ad6983 100644 --- a/src/test/java/fr/paris/lutece/plugins/forms/util/FormsEntryUtilsTest.java +++ b/src/test/java/fr/paris/lutece/plugins/forms/util/FormsEntryUtilsTest.java @@ -51,13 +51,16 @@ public class FormsEntryUtilsTest extends LuteceTestCase { private static final int ENTRY_TYPE_TEXT_ID = 106; private static final String ENTRY_TYPE_TITLE = "default_entry_type_title"; - + private static final String BEAN_NAME_ENTRY_TYPE_NUMBER = "forms.entryTypeNumber"; private static final String BEAN_NAME_ENTRY_TYPE_TEXT = "forms.entryTypeText"; public void testCreateEntryByType() { + List entryTypes = FormsEntryUtils.initListEntryType(); + EntryType entryTypeNumber = entryTypes.stream().filter( type -> BEAN_NAME_ENTRY_TYPE_NUMBER.equals( type.getBeanName( ) ) ).findFirst( ).orElse( null ); + assertNotNull(entryTypeNumber); - Entry entryByType = FormsEntryUtils.createEntryByType(120); + Entry entryByType = FormsEntryUtils.createEntryByType(entryTypeNumber.getIdType()); assertNotNull(entryByType); EntryType entryType = entryByType.getEntryType(); assertNotNull(entryType); @@ -80,7 +83,7 @@ public void testGetIndexFieldInTheFieldList() { public void testInitRefListEntryType() { ReferenceList referenceItems = FormsEntryUtils.initRefListEntryType(); - assertEquals(18, referenceItems.size()); + assertEquals(22, referenceItems.size()); } public void testInitListEntryType() {