Skip to content

Commit ffcd106

Browse files
izaerabrianchandotcom
izaera
authored and
brianchandotcom
committed
LPD-52709 Fix PortletRenderUtilTest
1 parent 468b8be commit ffcd106

File tree

1 file changed

+62
-48
lines changed

1 file changed

+62
-48
lines changed

‎portal-kernel/test/unit/com/liferay/portal/kernel/portlet/render/PortletRenderUtilTest.java‎

Lines changed: 62 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,29 @@ public void testGetPortletRenderParts() throws Exception {
7878
portletRenderParts.getHeaderCssPaths());
7979
_assertEquals(
8080
Arrays.asList(
81-
"/header-portal.js?t=7", "/nocombo-header-portal.js?t=7",
82-
"/o/portlet-web/header-portlet.js?t=7",
83-
"/o/portlet-web/nocombo-header-portlet.js?t=7",
81+
"/header-portal.(" + _HASH + ").js",
82+
"/nocombo-header-portal.(" + _HASH + ").js",
83+
"/o/portlet-web/header-portlet.(" + _HASH + ").js",
84+
"/o/portlet-web/nocombo-header-portlet.(" + _HASH + ").js",
8485
"http://example.com/header-portal.js",
8586
"http://example.com/header-portlet.js",
86-
"module:/module-header-portal.js?t=7",
87-
"module:/o/portlet-web/module-header-portlet.js?t=7",
87+
"module:/module-header-portal.(" + _HASH + ").js",
88+
"module:/o/portlet-web/module-header-portlet.(" + _HASH +
89+
").js",
8890
"module:http://example.com/module-header-portal.js",
8991
"module:http://example.com/module-header-portlet.js"),
9092
portletRenderParts.getHeaderJavaScriptPaths());
9193
_assertEquals(
9294
Arrays.asList(
93-
"/footer-portal.js?t=7", "/nocombo-footer-portal.js?t=7",
94-
"/o/portlet-web/footer-portlet.js?t=7",
95-
"/o/portlet-web/nocombo-footer-portlet.js?t=7",
95+
"/footer-portal.(" + _HASH + ").js",
96+
"/nocombo-footer-portal.(" + _HASH + ").js",
97+
"/o/portlet-web/footer-portlet.(" + _HASH + ").js",
98+
"/o/portlet-web/nocombo-footer-portlet.(" + _HASH + ").js",
9699
"http://example.com/footer-portal.js",
97100
"http://example.com/footer-portlet.js",
98-
"module:/module-footer-portal.js?t=7",
99-
"module:/o/portlet-web/module-footer-portlet.js?t=7",
101+
"module:/module-footer-portal.(" + _HASH + ").js",
102+
"module:/o/portlet-web/module-footer-portlet.(" + _HASH +
103+
").js",
100104
"module:http://example.com/module-footer-portal.js",
101105
"module:http://example.com/module-footer-portlet.js"),
102106
portletRenderParts.getFooterJavaScriptPaths());
@@ -144,14 +148,16 @@ public void testGetPortletRenderPartsWithContext() throws Exception {
144148
portletRenderParts.getHeaderCssPaths());
145149
_assertEquals(
146150
Arrays.asList(
147-
"/portal/header-portal.js?t=7",
148-
"/portal/nocombo-header-portal.js?t=7",
149-
"/portal/o/portlet-web/header-portlet.js?t=7",
150-
"/portal/o/portlet-web/nocombo-header-portlet.js?t=7",
151+
"/portal/header-portal.(" + _HASH + ").js",
152+
"/portal/nocombo-header-portal.(" + _HASH + ").js",
153+
"/portal/o/portlet-web/header-portlet.(" + _HASH + ").js",
154+
"/portal/o/portlet-web/nocombo-header-portlet.(" + _HASH +
155+
").js",
151156
"http://example.com/header-portal.js",
152157
"http://example.com/header-portlet.js",
153-
"module:/portal/module-header-portal.js?t=7",
154-
"module:/portal/o/portlet-web/module-header-portlet.js?t=7",
158+
"module:/portal/module-header-portal.(" + _HASH + ").js",
159+
"module:/portal/o/portlet-web/module-header-portlet.(" + _HASH +
160+
").js",
155161
"module:http://example.com/module-header-portal.js",
156162
"module:http://example.com/module-header-portlet.js"),
157163
portletRenderParts.getHeaderJavaScriptPaths());
@@ -171,14 +177,16 @@ public void testGetPortletRenderPartsWithContext() throws Exception {
171177
portletRenderParts.getFooterCssPaths());
172178
_assertEquals(
173179
Arrays.asList(
174-
"/portal/footer-portal.js?t=7",
175-
"/portal/nocombo-footer-portal.js?t=7",
176-
"/portal/o/portlet-web/footer-portlet.js?t=7",
177-
"/portal/o/portlet-web/nocombo-footer-portlet.js?t=7",
180+
"/portal/footer-portal.(" + _HASH + ").js",
181+
"/portal/nocombo-footer-portal.(" + _HASH + ").js",
182+
"/portal/o/portlet-web/footer-portlet.(" + _HASH + ").js",
183+
"/portal/o/portlet-web/nocombo-footer-portlet.(" + _HASH +
184+
").js",
178185
"http://example.com/footer-portal.js",
179186
"http://example.com/footer-portlet.js",
180-
"module:/portal/module-footer-portal.js?t=7",
181-
"module:/portal/o/portlet-web/module-footer-portlet.js?t=7",
187+
"module:/portal/module-footer-portal.(" + _HASH + ").js",
188+
"module:/portal/o/portlet-web/module-footer-portlet.(" + _HASH +
189+
").js",
182190
"module:http://example.com/module-footer-portal.js",
183191
"module:http://example.com/module-footer-portlet.js"),
184192
portletRenderParts.getFooterJavaScriptPaths());
@@ -217,15 +225,16 @@ public void testGetPortletRenderPartsWithContextAndProxy()
217225
portletRenderParts.getHeaderCssPaths());
218226
_assertEquals(
219227
Arrays.asList(
220-
"/proxy/portal/header-portal.js?t=7",
221-
"/proxy/portal/nocombo-header-portal.js?t=7",
222-
"/proxy/portal/o/portlet-web/header-portlet.js?t=7",
223-
"/proxy/portal/o/portlet-web/nocombo-header-portlet.js?t=7",
228+
"/proxy/portal/header-portal.(" + _HASH + ").js",
229+
"/proxy/portal/nocombo-header-portal.(" + _HASH + ").js",
230+
"/proxy/portal/o/portlet-web/header-portlet.(" + _HASH + ").js",
231+
"/proxy/portal/o/portlet-web/nocombo-header-portlet.(" + _HASH +
232+
").js",
224233
"http://example.com/header-portal.js",
225234
"http://example.com/header-portlet.js",
226-
"module:/proxy/portal/module-header-portal.js?t=7",
227-
"module:/proxy/portal/o/portlet-web/module-header-portlet.js?" +
228-
"t=7",
235+
"module:/proxy/portal/module-header-portal.(" + _HASH + ").js",
236+
"module:/proxy/portal/o/portlet-web/module-header-portlet.(" +
237+
_HASH + ").js",
229238
"module:http://example.com/module-header-portal.js",
230239
"module:http://example.com/module-header-portlet.js"),
231240
portletRenderParts.getHeaderJavaScriptPaths());
@@ -247,15 +256,16 @@ public void testGetPortletRenderPartsWithContextAndProxy()
247256
portletRenderParts.getFooterCssPaths());
248257
_assertEquals(
249258
Arrays.asList(
250-
"/proxy/portal/footer-portal.js?t=7",
251-
"/proxy/portal/nocombo-footer-portal.js?t=7",
252-
"/proxy/portal/o/portlet-web/footer-portlet.js?t=7",
253-
"/proxy/portal/o/portlet-web/nocombo-footer-portlet.js?t=7",
259+
"/proxy/portal/footer-portal.(" + _HASH + ").js",
260+
"/proxy/portal/nocombo-footer-portal.(" + _HASH + ").js",
261+
"/proxy/portal/o/portlet-web/footer-portlet.(" + _HASH + ").js",
262+
"/proxy/portal/o/portlet-web/nocombo-footer-portlet.(" + _HASH +
263+
").js",
254264
"http://example.com/footer-portal.js",
255265
"http://example.com/footer-portlet.js",
256-
"module:/proxy/portal/module-footer-portal.js?t=7",
257-
"module:/proxy/portal/o/portlet-web/module-footer-portlet.js?" +
258-
"t=7",
266+
"module:/proxy/portal/module-footer-portal.(" + _HASH + ").js",
267+
"module:/proxy/portal/o/portlet-web/module-footer-portlet.(" +
268+
_HASH + ").js",
259269
"module:http://example.com/module-footer-portal.js",
260270
"module:http://example.com/module-footer-portlet.js"),
261271
portletRenderParts.getFooterJavaScriptPaths());
@@ -290,14 +300,16 @@ public void testGetPortletRenderPartsWithProxy() throws Exception {
290300
portletRenderParts.getHeaderCssPaths());
291301
_assertEquals(
292302
Arrays.asList(
293-
"/proxy/header-portal.js?t=7",
294-
"/proxy/nocombo-header-portal.js?t=7",
295-
"/proxy/o/portlet-web/header-portlet.js?t=7",
296-
"/proxy/o/portlet-web/nocombo-header-portlet.js?t=7",
303+
"/proxy/header-portal.(" + _HASH + ").js",
304+
"/proxy/nocombo-header-portal.(" + _HASH + ").js",
305+
"/proxy/o/portlet-web/header-portlet.(" + _HASH + ").js",
306+
"/proxy/o/portlet-web/nocombo-header-portlet.(" + _HASH +
307+
").js",
297308
"http://example.com/header-portal.js",
298309
"http://example.com/header-portlet.js",
299-
"module:/proxy/module-header-portal.js?t=7",
300-
"module:/proxy/o/portlet-web/module-header-portlet.js?t=7",
310+
"module:/proxy/module-header-portal.(" + _HASH + ").js",
311+
"module:/proxy/o/portlet-web/module-header-portlet.(" + _HASH +
312+
").js",
301313
"module:http://example.com/module-header-portal.js",
302314
"module:http://example.com/module-header-portlet.js"),
303315
portletRenderParts.getHeaderJavaScriptPaths());
@@ -317,14 +329,16 @@ public void testGetPortletRenderPartsWithProxy() throws Exception {
317329
portletRenderParts.getFooterCssPaths());
318330
_assertEquals(
319331
Arrays.asList(
320-
"/proxy/footer-portal.js?t=7",
321-
"/proxy/nocombo-footer-portal.js?t=7",
322-
"/proxy/o/portlet-web/footer-portlet.js?t=7",
323-
"/proxy/o/portlet-web/nocombo-footer-portlet.js?t=7",
332+
"/proxy/footer-portal.(" + _HASH + ").js",
333+
"/proxy/nocombo-footer-portal.(" + _HASH + ").js",
334+
"/proxy/o/portlet-web/footer-portlet.(" + _HASH + ").js",
335+
"/proxy/o/portlet-web/nocombo-footer-portlet.(" + _HASH +
336+
").js",
324337
"http://example.com/footer-portal.js",
325338
"http://example.com/footer-portlet.js",
326-
"module:/proxy/module-footer-portal.js?t=7",
327-
"module:/proxy/o/portlet-web/module-footer-portlet.js?t=7",
339+
"module:/proxy/module-footer-portal.(" + _HASH + ").js",
340+
"module:/proxy/o/portlet-web/module-footer-portlet.(" + _HASH +
341+
").js",
328342
"module:http://example.com/module-footer-portal.js",
329343
"module:http://example.com/module-footer-portlet.js"),
330344
portletRenderParts.getFooterJavaScriptPaths());

0 commit comments

Comments
 (0)