Skip to content

Commit 90396a2

Browse files
marcelabcbrianchandotcom
authored andcommitted
LPD-56406 SF
1 parent d001c5b commit 90396a2

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

modules/apps/dynamic-data-mapping/dynamic-data-mapping-web-test/src/test/java/com/liferay/dynamic/data/mapping/web/internal/portlet/action/RenderStructureFieldMVCResourceCommandTest.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -99,40 +99,40 @@ public void testGetDDMFormField() {
9999
HtmlUtil.escapeAttribute(_SCRIPT)
100100
);
101101

102-
DDMFormField ddmFormFieldMock = Mockito.mock(DDMFormField.class);
102+
DDMFormDeserializer jsonDDMFormDeserializer = Mockito.mock(
103+
DDMFormDeserializer.class);
104+
105+
DDMFormDeserializerDeserializeResponse
106+
ddmFormDeserializerDeserializeResponse = Mockito.mock(
107+
DDMFormDeserializerDeserializeResponse.class);
103108

104109
Mockito.when(
105-
ddmFormFieldMock.getName()
110+
jsonDDMFormDeserializer.deserialize(Mockito.any())
106111
).thenReturn(
107-
HtmlUtil.escapeAttribute(_SCRIPT)
112+
ddmFormDeserializerDeserializeResponse
108113
);
109114

110115
DDMForm ddmForm = Mockito.mock(DDMForm.class);
111116

112117
Mockito.when(
113-
ddmForm.getDDMFormFieldsMap(true)
118+
ddmFormDeserializerDeserializeResponse.getDDMForm()
114119
).thenReturn(
115-
Collections.singletonMap(
116-
HtmlUtil.escapeAttribute(_SCRIPT), ddmFormFieldMock)
120+
ddmForm
117121
);
118122

119-
DDMFormDeserializerDeserializeResponse
120-
ddmFormDeserializerDeserializeResponseMock = Mockito.mock(
121-
DDMFormDeserializerDeserializeResponse.class);
123+
DDMFormField ddmFormFieldMock = Mockito.mock(DDMFormField.class);
122124

123125
Mockito.when(
124-
ddmFormDeserializerDeserializeResponseMock.getDDMForm()
126+
ddmFormFieldMock.getName()
125127
).thenReturn(
126-
ddmForm
128+
HtmlUtil.escapeAttribute(_SCRIPT)
127129
);
128130

129-
DDMFormDeserializer jsonDDMFormDeserializerMock = Mockito.mock(
130-
DDMFormDeserializer.class);
131-
132131
Mockito.when(
133-
jsonDDMFormDeserializerMock.deserialize(Mockito.any())
132+
ddmForm.getDDMFormFieldsMap(true)
134133
).thenReturn(
135-
ddmFormDeserializerDeserializeResponseMock
134+
Collections.singletonMap(
135+
HtmlUtil.escapeAttribute(_SCRIPT), ddmFormFieldMock)
136136
);
137137

138138
RenderStructureFieldMVCResourceCommand
@@ -141,7 +141,7 @@ public void testGetDDMFormField() {
141141

142142
ReflectionTestUtil.setFieldValue(
143143
renderStructureFieldMVCResourceCommand, "_jsonDDMFormDeserializer",
144-
jsonDDMFormDeserializerMock);
144+
jsonDDMFormDeserializer);
145145

146146
DDMFormField ddmFormField =
147147
renderStructureFieldMVCResourceCommand.getDDMFormField(

0 commit comments

Comments
 (0)