Ticket #4136: 4136.patch

_source/tests/plugins/htmldataprocessor/htmldataprocessor.html

@@ -265 +265 @@
                         dataProcessor.writer = new CKEDITOR.htmlParser.basicWriter();
                         var html = getTextAreaValue( '_TEXTAREA_3591_2' );
                         var protectedHtml = dataProcessor.toHtml( html );
+                        var dataHtml = dataProcessor.toDataFormat( protectedHtml );
 
-                        assert.areSame( getTextAreaValue( '_TEXTAREA_3591_2' ),
-                                dataProcessor.toDataFormat( protectedHtml ) );
+                        var regexes = [
+                                /<object[^>]+classid\s*=\s*['"]clsid['"]/,
+                                /<object[^>]+><param[^>]+name\s*=\s*['"]movie['"]/,
+                                /<object[^>]+><param[^>]+value\s*=\s*['"]movie.swf['"]/,
+                                /<object[^>]+><param[^>]+><embed[^>]+src\s*=\s*['"]movie.swf['"]/,
+                                /<object[^>]+><param[^>]+><embed[^>]+type\s*=\s*['"]application\/x-shockwave-flash['"]/
+                        ];
+
+                        for ( var i in regexes )
+                        {
+                                assert.isTrue( regexes[ i ].test( dataHtml ), regexes[ i ].toString() );
+                        }
                 },
 
                 test_ticket_3869_1 : function()
@@ -308 +319 @@
                         var editor = CKEDITOR.instances.editor1,
                                 dataProcessor = editor.dataProcessor;
                         dataProcessor.writer = new CKEDITOR.htmlParser.basicWriter();
+                        var html = dataProcessor.toHtml( '<p><a href="" name="">emptylink</a></p>' );
+                        var dataHtml = dataProcessor.toDataFormat( html );
 
-                        assert.areSame( '<p><a href="" name="">emptylink</a></p>',
-                                dataProcessor.toDataFormat( dataProcessor.toHtml( '<p><a href="" name="">emptylink</a></p>' ) ) );
+                        var regexes = [
+                                /<p><a[^>]+href\s*=\s*['"]['"]/,
+                                /<p><a[^>]+name\s*=\s*['"]['"]/,
+                                /<p><a[^>]+name\s*=\s*['"]['"]/,
+                                /<p><a[^>]+>emptylink<\/a><\/p>/,
+                        ];
+
+                        for ( var i in regexes )
+                                assert.isTrue( regexes[ i ].test( dataHtml ), regexes[ i ].toString() );
                 },
 
                 test_innerHtmlComments_ticket_3801 : function()

_source/tests/plugins/styles/styles.html

@@ -323 +323 @@
 
                         var style = new CKEDITOR.style( { element : 'b', styles : { color : 'red', 'font-weight' : '700' } } );
                         style.applyToRange( range );
+                        var html = getInnerHtml( '_P1' );
 
-                        assert.areSame( '<b lang="pt" style="font-size:11pt;color:red;">this<b style="font-weight:700;"> is some sample text</b></b>', getInnerHtml( '_P1' ), 'First range' );
+                        var regexes = [
+                                /<b[^>]+lang\s*=\s*['"]pt['"]/,
+                                /<b[^>]+lang\s*=\s*['"]pt['"]/,
+                                /<b[^>]+>[^<]+<b[^>]+> is some sample text<\/b><\/b>/,
+                        ];
+                        var regexesMatch = [
+                                [ /<b[^>]+style\s*=\s*['"](.*?)['"]/, "color:red;font-size:11pt;" ],
+                                [ /<b[^>]+>this<b[^>]+style\s*=\s*['"](.*?)['"]/, "font-weight:700;" ]
+                        ];
+
+                        var i;
+                        for ( i in regexes )
+                                assert.isTrue( regexes[ i ].test( html ), regexes[ i ].toString() );
+                        
+                        for ( i in regexesMatch )
+                        {
+                                var match = regexesMatch[ i ];
+                                var result = html.match( match[ 0 ] );
+                                var matched = result[ 1 ].toLowerCase().replace( ' ', '' ).replace( /;$/, '' ).split( ';' ).sort().join( ';' ) + ';';
+                                assert.areSame( match[ 1 ], matched );
+                        }
                 },
 
                 test_inline_nobreak1 : function()