24
24
import java .util .Collections ;
25
25
26
26
import org .junit .Assert ;
27
+ import org .junit .Before ;
27
28
import org .junit .ClassRule ;
28
29
import org .junit .Test ;
29
30
@@ -38,11 +39,8 @@ public class RenderStructureFieldMVCResourceCommandTest {
38
39
public static final LiferayUnitTestRule liferayUnitTestRule =
39
40
LiferayUnitTestRule .INSTANCE ;
40
41
41
- @ Test
42
- public void testCreateDDMFormFieldRenderingContext () {
43
- HttpServletRequest httpServletRequest = Mockito .mock (
44
- HttpServletRequest .class );
45
-
42
+ @ Before
43
+ public void setUp () throws Exception {
46
44
ThemeDisplay themeDisplay = Mockito .mock (ThemeDisplay .class );
47
45
48
46
Mockito .when (
@@ -52,23 +50,24 @@ public void testCreateDDMFormFieldRenderingContext() {
52
50
);
53
51
54
52
Mockito .when (
55
- httpServletRequest .getAttribute (WebKeys .THEME_DISPLAY )
53
+ _httpServletRequest .getAttribute (WebKeys .THEME_DISPLAY )
56
54
).thenReturn (
57
55
themeDisplay
58
56
);
57
+ }
59
58
60
- String script = "' \" ></option><img onerror=alert(123) src=x>" ;
61
-
59
+ @ Test
60
+ public void testCreateDDMFormFieldRenderingContext () {
62
61
Mockito .when (
63
- httpServletRequest .getParameter ("namespace" )
62
+ _httpServletRequest .getParameter ("namespace" )
64
63
).thenReturn (
65
- script
64
+ _SCRIPT
66
65
);
67
66
68
67
Mockito .when (
69
- httpServletRequest .getParameter ("portletNamespace" )
68
+ _httpServletRequest .getParameter ("portletNamespace" )
70
69
).thenReturn (
71
- script
70
+ _SCRIPT
72
71
);
73
72
74
73
RenderStructureFieldMVCResourceCommand
@@ -81,56 +80,37 @@ public void testCreateDDMFormFieldRenderingContext() {
81
80
DDMFormFieldRenderingContext ddmFormFieldRenderingContext =
82
81
renderStructureFieldMVCResourceCommand .
83
82
createDDMFormFieldRenderingContext (
84
- httpServletRequest ,
83
+ _httpServletRequest ,
85
84
Mockito .mock (HttpServletResponse .class ));
86
85
87
86
Assert .assertEquals (
88
- HtmlUtil .escapeAttribute (script ),
87
+ HtmlUtil .escapeAttribute (_SCRIPT ),
89
88
ddmFormFieldRenderingContext .getNamespace ());
90
89
Assert .assertEquals (
91
- HtmlUtil .escapeAttribute (script ),
90
+ HtmlUtil .escapeAttribute (_SCRIPT ),
92
91
ddmFormFieldRenderingContext .getPortletNamespace ());
93
92
}
94
93
95
94
@ Test
96
95
public void testGetDDMFormField () {
97
- HttpServletRequest httpServletRequest = Mockito .mock (
98
- HttpServletRequest .class );
99
-
100
- ThemeDisplay themeDisplay = Mockito .mock (ThemeDisplay .class );
101
-
102
96
Mockito .when (
103
- themeDisplay . getLocale ( )
97
+ _httpServletRequest . getParameter ( "definition" )
104
98
).thenReturn (
105
- LocaleUtil . US
99
+ _SCRIPT
106
100
);
107
101
108
102
Mockito .when (
109
- httpServletRequest . getAttribute ( WebKeys . THEME_DISPLAY )
103
+ _httpServletRequest . getParameter ( "fieldName" )
110
104
).thenReturn (
111
- themeDisplay
112
- );
113
-
114
- String script = "'\" ></option><img onerror=alert(123) src=x>" ;
115
-
116
- Mockito .when (
117
- httpServletRequest .getParameter ("definition" )
118
- ).thenReturn (
119
- script
120
- );
121
-
122
- Mockito .when (
123
- httpServletRequest .getParameter ("fieldName" )
124
- ).thenReturn (
125
- HtmlUtil .escapeAttribute (script )
105
+ HtmlUtil .escapeAttribute (_SCRIPT )
126
106
);
127
107
128
108
DDMFormField ddmFormFieldMock = Mockito .mock (DDMFormField .class );
129
109
130
110
Mockito .when (
131
111
ddmFormFieldMock .getName ()
132
112
).thenReturn (
133
- HtmlUtil .escapeAttribute (script )
113
+ HtmlUtil .escapeAttribute (_SCRIPT )
134
114
);
135
115
136
116
DDMForm ddmForm = Mockito .mock (DDMForm .class );
@@ -139,7 +119,7 @@ public void testGetDDMFormField() {
139
119
ddmForm .getDDMFormFieldsMap (true )
140
120
).thenReturn (
141
121
Collections .singletonMap (
142
- HtmlUtil .escapeAttribute (script ), ddmFormFieldMock )
122
+ HtmlUtil .escapeAttribute (_SCRIPT ), ddmFormFieldMock )
143
123
);
144
124
145
125
DDMFormDeserializerDeserializeResponse
@@ -174,12 +154,17 @@ public void testGetDDMFormField() {
174
154
175
155
DDMFormField ddmFormField = ReflectionTestUtil .invoke (
176
156
renderStructureFieldMVCResourceCommand , "_getDDMFormField" ,
177
- new Class <?>[] {HttpServletRequest .class }, httpServletRequest );
157
+ new Class <?>[] {HttpServletRequest .class }, _httpServletRequest );
178
158
179
159
Assert .assertEquals (
180
- HtmlUtil .escapeAttribute (script ), ddmFormField .getName ());
160
+ HtmlUtil .escapeAttribute (_SCRIPT ), ddmFormField .getName ());
181
161
}
182
162
163
+ private static final String _SCRIPT =
164
+ "'\" ></option><img onerror=alert(123) src=x>" ;
165
+
166
+ private final HttpServletRequest _httpServletRequest = Mockito .mock (
167
+ HttpServletRequest .class );
183
168
private final Portal _portal = Mockito .mock (Portal .class );
184
169
185
170
}
0 commit comments