Index: _test/automated/_jsunit/app/jsUnitCore.js =================================================================== --- _test/automated/_jsunit/app/jsUnitCore.js (revision 1693) +++ _test/automated/_jsunit/app/jsUnitCore.js (working copy) @@ -75,11 +75,11 @@ } function _displayStringForValue(aVar) { - var result = '<' + aVar + '>'; + var result = '[' + aVar + ']'; if (!(aVar === null || aVar === top.JSUNIT_UNDEFINED_VALUE)) { result += ' (' + _trueTypeOf(aVar) + ')'; } - return result; + return '\n' + result + '\n'; } function fail(failureMessage) { Index: _test/automated/tests/fckdomtools.html =================================================================== --- _test/automated/tests/fckdomtools.html (revision 1693) +++ _test/automated/tests/fckdomtools.html (working copy) @@ -32,6 +32,31 @@ + @@ -115,5 +185,7 @@ This paragraph has and image at the very end of its contents.

+

This is some sample test text

+

test

Index: _test/automated/tests/fckw3crange.html =================================================================== --- _test/automated/tests/fckw3crange.html (revision 1693) +++ _test/automated/tests/fckw3crange.html (working copy) @@ -628,6 +628,54 @@ assertTrue( 'range.collapsed', range.collapsed ) ; } +function test_extractContents_Other_5() +{ + document.body.innerHTML = '

test

' ; + + var range = FCKW3CRange.CreateRange( document ) ; + + range.setStartAfter( document.getElementsByTagName('i')[0] ) ; + range.setEndAfter( document.getElementsByTagName('b')[0] ) ; + + var docFrag = range.extractContents() ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', '', GetTestInnerHtml( tmpDiv ) ) ; + assertEquals( 'HTML after extraction', '

test

', GetTestInnerHtml( document.body ) ) ; + + assertEquals( 'range.startContainer', document.body.firstChild, range.startContainer ) ; + assertEquals( 'range.startOffset', 1, range.startOffset ) ; + assertEquals( 'range.endContainer', document.body.firstChild, range.endContainer ) ; + assertEquals( 'range.endOffset', 1, range.endOffset ) ; + assertTrue( 'range.collapsed', range.collapsed ) ; +} + +function test_extractContents_Other_6() +{ + document.body.innerHTML = '

test

' ; + + var range = FCKW3CRange.CreateRange( document ) ; + + range.setStartBefore( document.getElementsByTagName('b')[0] ) ; + range.setEndBefore( document.getElementsByTagName('i')[0] ) ; + + var docFrag = range.extractContents() ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', '', GetTestInnerHtml( tmpDiv ) ) ; + assertEquals( 'HTML after extraction', '

test

', GetTestInnerHtml( document.body ) ) ; + + assertEquals( 'range.startContainer', document.body.firstChild, range.startContainer ) ; + assertEquals( 'range.startOffset', 0, range.startOffset ) ; + assertEquals( 'range.endContainer', document.body.firstChild, range.endContainer ) ; + assertEquals( 'range.endOffset', 0, range.endOffset ) ; + assertTrue( 'range.collapsed', range.collapsed ) ; +} + // W3C DOM Range Specs - Section 2.7 - Example 1 function test_cloneContents_W3C_1() { @@ -847,11 +895,19 @@