@@ -90,7 +90,8 @@ class LazyloadImagesFilterTest : public RewriteTestBase {
90
90
TEST_F (LazyloadImagesFilterTest, SingleHead) {
91
91
InitLazyloadImagesFilter (false );
92
92
93
- ValidateExpected (" lazyload_images" ,
93
+ ValidateExpected (
94
+ " lazyload_images" ,
94
95
" <head></head>"
95
96
" <body>"
96
97
" <img />"
@@ -114,7 +115,9 @@ TEST_F(LazyloadImagesFilterTest, SingleHead) {
114
115
" <img src=\" 1.jpg\" onload=\" blah();\" />"
115
116
" <img src=\" 1.jpg\" class=\" 123 dfcg-metabox\" />"
116
117
" </body>" ,
117
- StrCat (" <head></head><body><img/>"
118
+ StrCat (" <head>" ,
119
+ GetLazyloadScriptHtml (),
120
+ " </head><body><img/>"
118
121
" <img src=\"\" />"
119
122
" <noscript>"
120
123
" <img src=\" noscript.jpg\" />"
@@ -125,7 +128,6 @@ TEST_F(LazyloadImagesFilterTest, SingleHead) {
125
128
" <marquee>"
126
129
" <img src=\" marquee.jpg\" />"
127
130
" </marquee>" ,
128
- GetLazyloadScriptHtml (),
129
131
GenerateRewrittenImageTag (" img" , " 1.jpg" , " " ),
130
132
" <img src=\" 1.jpg\" pagespeed_no_defer />"
131
133
" <img src=\" 1.jpg\" data-src=\" 2.jpg\" />" ,
@@ -167,16 +169,16 @@ TEST_F(LazyloadImagesFilterTest, Blacklist) {
167
169
ValidateExpected (
168
170
" lazyload_images" ,
169
171
input_html,
170
- StrCat (" <head></head><body>"
171
- " <img src=\" http://www.1.com/blacklist.jpg\" />" ,
172
+ StrCat (" <head>" ,
172
173
GetLazyloadScriptHtml (),
173
- StrCat (
174
- GenerateRewrittenImageTag (
175
- " img" , " http://www.1.com/img1" , " " ),
176
- GenerateRewrittenImageTag (
177
- " img" , " img2" , " " ),
178
- GetLazyloadPostscriptHtml (),
179
- " </body>" )));
174
+ " </head><body>"
175
+ " <img src=\" http://www.1.com/blacklist.jpg\" />" ,
176
+ GenerateRewrittenImageTag (
177
+ " img" , " http://www.1.com/img1" , " " ),
178
+ GenerateRewrittenImageTag (
179
+ " img" , " img2" , " " ),
180
+ GetLazyloadPostscriptHtml (),
181
+ " </body>" ));
180
182
EXPECT_EQ (3 , logging_info ()->rewriter_info ().size ());
181
183
ExpectLogRecord (0 , RewriterApplication::NOT_APPLIED, true , false );
182
184
ExpectLogRecord (1 , RewriterApplication::APPLIED_OK, false , false );
@@ -210,16 +212,16 @@ TEST_F(LazyloadImagesFilterTest, CriticalImages) {
210
212
ValidateExpected (
211
213
" lazyload_images" ,
212
214
input_html,
213
- StrCat (" <head></head><body>"
214
- " <img src=\" http://www.1.com/critical\" />" ,
215
+ StrCat (" <head>" ,
215
216
GetLazyloadScriptHtml (),
216
- StrCat (
217
- GenerateRewrittenImageTag (
218
- " img" , " http://www.1.com/critical2" , " " ),
219
- " <img src=\" critical3\" />"
220
- " <img src=\" " , rewritten_url, " \" />" ,
221
- GetLazyloadPostscriptHtml (),
222
- " </body>" )));
217
+ " </head><body>"
218
+ " <img src=\" http://www.1.com/critical\" />" ,
219
+ GenerateRewrittenImageTag (
220
+ " img" , " http://www.1.com/critical2" , " " ),
221
+ " <img src=\" critical3\" />"
222
+ " <img src=\" " , rewritten_url, " \" />" ,
223
+ GetLazyloadPostscriptHtml (),
224
+ " </body>" ));
223
225
EXPECT_EQ (4 , logging_info ()->rewriter_info ().size ());
224
226
ExpectLogRecord (0 , RewriterApplication::NOT_APPLIED, false , true );
225
227
ExpectLogRecord (1 , RewriterApplication::APPLIED_OK, false , false );
@@ -252,14 +254,16 @@ TEST_F(LazyloadImagesFilterTest, CriticalImages) {
252
254
TEST_F (LazyloadImagesFilterTest, SingleHeadLoadOnOnload) {
253
255
options ()->set_lazyload_images_after_onload (true );
254
256
InitLazyloadImagesFilter (false );
255
- ValidateExpected (" lazyload_images" ,
257
+ ValidateExpected (
258
+ " lazyload_images" ,
256
259
" <head></head>"
257
260
" <body>"
258
261
" <img src=\" 1.jpg\" />"
259
262
" </body>" ,
260
- StrCat (" <head></head>"
261
- " <body>" ,
263
+ StrCat (" <head>" ,
262
264
GetLazyloadScriptHtml (),
265
+ " </head>"
266
+ " <body>" ,
263
267
GenerateRewrittenImageTag (" img" , " 1.jpg" , " " ),
264
268
GetLazyloadPostscriptHtml (),
265
269
" </body>" ));
@@ -271,31 +275,36 @@ TEST_F(LazyloadImagesFilterTest, SingleHeadLoadOnOnload) {
271
275
// not an onload attribute added by PageSpeed.
272
276
TEST_F (LazyloadImagesFilterTest, NoLazyloadImagesWithOnloadAttribute) {
273
277
InitLazyloadImagesFilter (false );
274
- ValidateExpected (" lazyload_images" ,
278
+ ValidateExpected (
279
+ " lazyload_images" ,
275
280
" <head></head>"
276
281
" <body>"
277
282
" <img src=\" 1.jpg\" onload=\" do_something();\" />"
278
283
" </body>" ,
279
- " <head></head>"
280
- " <body>"
281
- " <img src=\" 1.jpg\" onload=\" do_something();\" />"
282
- " </body>" );
284
+ StrCat (" <head>" ,
285
+ GetLazyloadScriptHtml (),
286
+ " </head>"
287
+ " <body>"
288
+ " <img src=\" 1.jpg\" onload=\" do_something();\" />"
289
+ " </body>" ));
283
290
}
284
291
285
292
// Verify that lazyload_images gets applied on image elements that have an
286
293
// onload handler whose value is CriticalImagesBeaconFilter::kImageOnloadCode.
287
294
TEST_F (LazyloadImagesFilterTest, LazyloadWithPagespeedAddedOnloadAttribute) {
288
295
InitLazyloadImagesFilter (false );
289
- ValidateExpected (" lazyload_images" ,
296
+ ValidateExpected (
297
+ " lazyload_images" ,
290
298
StrCat (" <head></head>"
291
299
" <body>"
292
300
" <img src=\" 1.jpg\" onload=\" " ,
293
301
CriticalImagesBeaconFilter::kImageOnloadCode ,
294
302
" \" />"
295
303
" </body>" ),
296
- StrCat (" <head></head>"
297
- " <body>" ,
304
+ StrCat (" <head>" ,
298
305
GetLazyloadScriptHtml (),
306
+ " </head>"
307
+ " <body>" ,
299
308
GenerateRewrittenImageTag (" img" , " 1.jpg" , " " ),
300
309
GetLazyloadPostscriptHtml (),
301
310
" </body>" ));
@@ -314,8 +323,8 @@ TEST_F(LazyloadImagesFilterTest, MultipleBodies) {
314
323
" <script></script>"
315
324
" </body>" ,
316
325
StrCat (
317
- " <body>" ,
318
326
GetLazyloadScriptHtml (),
327
+ " <body>" ,
319
328
GenerateRewrittenImageTag (" img" , " 1.jpg" , " " ),
320
329
GetLazyloadPostscriptHtml (),
321
330
StrCat (
@@ -337,8 +346,8 @@ TEST_F(LazyloadImagesFilterTest, NoHeadTag) {
337
346
" <body>"
338
347
" <img src=\" 1.jpg\" />"
339
348
" </body>" ,
340
- StrCat (" <body> " ,
341
- GetLazyloadScriptHtml () ,
349
+ StrCat (GetLazyloadScriptHtml () ,
350
+ " <body> " ,
342
351
GenerateRewrittenImageTag (" img" , " 1.jpg" , " " ),
343
352
GetLazyloadPostscriptHtml (),
344
353
" </body>" ));
@@ -367,8 +376,8 @@ TEST_F(LazyloadImagesFilterTest, CustomImageUrl) {
367
376
" <body>"
368
377
" <img src=\" 1.jpg\" />"
369
378
" </body>" ,
370
- StrCat (" <body> " ,
371
- GetLazyloadScriptHtml () ,
379
+ StrCat (GetLazyloadScriptHtml () ,
380
+ " <body> " ,
372
381
GenerateRewrittenImageTag (" img" , " 1.jpg" , " " ),
373
382
GetLazyloadPostscriptHtml (),
374
383
" </body>" ));
@@ -382,7 +391,8 @@ TEST_F(LazyloadImagesFilterTest, DfcgClass) {
382
391
" <img src=\" 1.jpg\" />"
383
392
" </div>"
384
393
" </body>" ;
385
- ValidateNoChanges (" lazyload_images" , input_html);
394
+ ValidateExpected (" DfcgClass" ,
395
+ input_html, StrCat (GetLazyloadScriptHtml (), input_html));
386
396
}
387
397
388
398
TEST_F (LazyloadImagesFilterTest, NivoClass) {
@@ -393,7 +403,8 @@ TEST_F(LazyloadImagesFilterTest, NivoClass) {
393
403
" </div>"
394
404
" <img class=\" nivo\" src=\" 1.jpg\" />"
395
405
" </body>" ;
396
- ValidateNoChanges (" lazyload_images" , input_html);
406
+ ValidateExpected (" NivoClass" ,
407
+ input_html, StrCat (GetLazyloadScriptHtml (), input_html));
397
408
}
398
409
399
410
TEST_F (LazyloadImagesFilterTest, ClassContainsSlider) {
@@ -404,13 +415,16 @@ TEST_F(LazyloadImagesFilterTest, ClassContainsSlider) {
404
415
" </div>"
405
416
" <img class=\" my_sLiDer\" src=\" 1.jpg\" />"
406
417
" </body>" ;
407
- ValidateNoChanges (" lazyload_images" , input_html);
418
+ ValidateExpected (" SliderClass" ,
419
+ input_html, StrCat (GetLazyloadScriptHtml (), input_html));
408
420
}
409
421
410
422
TEST_F (LazyloadImagesFilterTest, NoImages) {
411
423
InitLazyloadImagesFilter (false );
412
424
GoogleString input_html = " <head></head><body></body>" ;
413
- ValidateNoChanges (" lazyload_images" , input_html);
425
+ ValidateExpected (" NoImages" , input_html,
426
+ StrCat (" <head>" , GetLazyloadScriptHtml (),
427
+ " </head><body></body>" ));
414
428
EXPECT_EQ (0 , logging_info ()->rewriter_info ().size ());
415
429
}
416
430
@@ -440,7 +454,8 @@ TEST_F(LazyloadImagesFilterTest, LazyloadDisabledWithJquerySlider) {
440
454
" <img src=\" 1.jpg\" />"
441
455
" </body>" ;
442
456
// No change in the html.
443
- ValidateNoChanges (" lazyload_images" , input_html);
457
+ ValidateExpected (" JQuerySlider" , input_html,
458
+ StrCat (GetLazyloadScriptHtml (), input_html));
444
459
}
445
460
446
461
TEST_F (LazyloadImagesFilterTest, LazyloadDisabledWithJquerySliderAfterHead) {
@@ -451,7 +466,15 @@ TEST_F(LazyloadImagesFilterTest, LazyloadDisabledWithJquerySliderAfterHead) {
451
466
" <script src=\" jquery.sexyslider.js\" />"
452
467
" <img src=\" 1.jpg\" />"
453
468
" </body>" ;
454
- ValidateNoChanges (" abort_script_inserted" , input_html);
469
+ GoogleString expected_html = StrCat (
470
+ " <head>" ,
471
+ GetLazyloadScriptHtml (),
472
+ " </head>"
473
+ " <body>"
474
+ " <script src=\" jquery.sexyslider.js\" />"
475
+ " <img src=\" 1.jpg\" />"
476
+ " </body>" );
477
+ ValidateExpected (" abort_script_inserted" , input_html, expected_html);
455
478
}
456
479
457
480
TEST_F (LazyloadImagesFilterTest, LazyloadDisabledForOldBlackberry) {
0 commit comments