Test Create Lists

Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/scripts/user-extensions.js =================================================================== --- /FCKeditor/branches/features/selenium-tests/_test/selenium/scripts/user-extensions.js (revision 999) +++ /FCKeditor/branches/features/selenium-tests/_test/selenium/scripts/user-extensions.js (revision 1000) @@ -37,10 +37,22 @@ else if ( curNode.nodeType == 3 ) { + // usual spaces in HTML can always be compressed to a single space and not affect + // the visual appearence... except for things inside a
 				if ( curNode.parentNode && curNode.parentNode.nodeName.toLowerCase() != 'pre' )
 				{
 					curNode.nodeValue = curNode.nodeValue.replace( /[ \t\r\n]+/g, ' ' ) ;
-					if ( curNode.nodeValue == ' ' )
-						nodesToDelete.push( curNode ) ;
 				}
+
+				// spaces just after or just before a block node or 
 are useless
+				var prevNode = curNode.previousSibling ;
+				var nextNode = curNode.nextSibling ;
+				var prevNodeName = prevNode ? prevNode.nodeName.toLowerCase() : "" ;
+				var nextNodeName = nextNode ? nextNode.nodeName.toLowerCase() : "" ;
+				if ( editor.FCKListsLib.BlockBoundaries[ prevNodeName ] || prevNodeName == 'br' )
+					curNode.nodeValue = curNode.nodeValue.replace( /^[ \t\r\n]+/g, '' ) ;
+				if ( editor.FCKListsLib.BlockBoundaries[ nextNodeName ] || nextNodeName == 'br' )
+					curNode.nodeValue = curNode.nodeValue.replace( /[ \t\r\n]+$/g, '' ) ;
+				if ( curNode.nodeValue == '' )
+					nodesToDelete.push( curNode ) ;
 			}
 			curNode = editor.FCKDomTools.GetNextSourceNode( curNode ) ;
@@ -101,8 +113,18 @@
 		while ( editorNode || verifyNode )
 		{
+			if ( ! editorNode )
+				throw new SeleniumError( "DOM structure mismatch: missing DOM node in editor document - "
+					       + verifyNode.nodeName + " expected." ) ;
+			if ( ! verifyNode )
+				throw new SeleniumError( "DOM structure mismatch: missing DOM node in verification document - "
+					       + editorNode.nodeName + " expected." ) ;
 			if ( editorNode.nodeType == 1 && editorNode.nodeName != verifyNode.nodeName )
-				throw new SeleniumError( "DOM structure mismatch: element tags are different." ) ;
+				throw new SeleniumError( "DOM structure mismatch: element tags are different - "
+					       + editorNode.nodeName + " encountered in editor document while "
+					       + verifyNode.nodeName + " is expected by verification document." ) ;
 			if ( editorNode.nodeType == 3 && editorNode.nodeValue != verifyNode.nodeValue )
-				throw new SeleniumError( "DOM structure mismatch: text node values are different." ) ;
+				throw new SeleniumError( "DOM structure mismatch: text node values are different - "
+						+ "'" + editorNode.nodeValue + "' is different "
+						+ " to '" + verifyNode.nodeValue + "'." ) ;
 			editorNode = win.FCKDomTools.GetNextSourceNode( editorNode ) ;
 			verifyNode = win.FCKDomTools.GetNextSourceNode( verifyNode ) ;
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/FCKTestSuite.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/FCKTestSuite.html	(revision 999)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/FCKTestSuite.html	(revision 1000)
@@ -6,7 +6,7 @@
 		
-				
+				
-				
+				
 			Load FCKeditor
FCKeditor Test Suite
 				Test Load FCKeditor
Test Create Lists
Test List Creation and Removal
 			
 		
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/TestCreateList.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/TestCreateList.html	(revision 999)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/TestCreateList.html	(revision 1000)
@@ -11,5 +11,5 @@
 	-->
 	
-		Test Create Lists
+		Test List Creation and Removal
 	
 	
@@ -17,6 +17,5 @@
 			
 				
-					Test Create Lists

-					
+					Test List Creation and Removal
 				
 				
@@ -25,4 +24,6 @@
 					
 				
+				
+				
 				
 					fckLoadContents
@@ -37,5 +38,169 @@
 				
 					fckCheckSimilarTo
-					tests/html/test_list_input1_results.html
+					tests/html/test_list_input1_results1.html
+					
+				
+				
+				
+					fckExecuteCommand
+					InsertOrderedList
+					
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input1_results2.html
+					
+				
+				
+				
+					fckExecuteCommand
+					InsertUnorderedList
+					
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input1_results3.html
+					
+				
+				
+				
+					waitForCondition
+					
+						win=selenium.browserbot.getCurrentWindow() ;
+						win.FCKConfig.EnterMode = 'br' ;
+						true ;
+					
+					500
+				
+				
+					fckExecuteCommand
+					InsertUnorderedList
+					
+				
+				
+					waitForCondition
+					
+					
+						win.FCKConfig.EnterMode = 'p' ;
+						true ;
+					
+					500
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input1_results4.html
+					
+				
+				
+				
+					fckLoadContents
+					tests/html/test_list_input2.html
+					
+				
+				
+					fckExecuteCommand
+					InsertUnorderedList
+					
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input2_results1.html
+					
+				
+				
+				
+					fckLoadContents
+					tests/html/test_list_input3.html
+					
+				
+				
+					fckExecuteCommand
+					InsertOrderedList
+					
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input3_results1.html
+					
+				
+				
+				
+					fckLoadContents
+					tests/html/test_list_input4.html
+					
+				
+				
+					fckExecuteCommand
+					InsertUnorderedList
+					
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input4_results1.html
+					
+				
+				
+				
+					fckLoadContents
+					tests/html/test_list_input5.html
+					
+				
+				
+					fckExecuteCommand
+					InsertUnorderedList
+					
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input5_results1.html
+					
+				
+				
+				
+					fckLoadContents
+					tests/html/test_list_input6.html
+					
+				
+				
+					fckExecuteCommand
+					InsertUnorderedList
+					
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input6_results1.html
+					
+				
+				
+				
+					fckLoadContents
+					tests/html/test_list_input7.html
+					
+				
+				
+					fckExecuteCommand
+					InsertUnorderedList
+					
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input7_results1.html
+					
+				
+				
+				
+					fckLoadContents
+					tests/html/test_list_input8.html
+					
+				
+				
+					fckExecuteCommand
+					InsertOrderedList
+					
+				
+				
+					fckCheckSimilarTo
+					tests/html/test_list_input8_results1.html
 					
 				
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results1.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results1.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results1.html	(revision 1000)
@@ -0,0 +1,9 @@
+line 1 is not part of the list
+
+	this is point 1
+	this is point 2
+	this is point 3
+	this is point 4
+	this is point 5
+
+line 6 is not part of the list
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results2.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results2.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results2.html	(revision 1000)
@@ -0,0 +1,7 @@
+line 1 is not part of the list
+this is point 1
+this is point 2
+this is point 3
+this is point 4
+this is point 5
+line 6 is not part of the list
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results3.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results3.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results3.html	(revision 1000)
@@ -0,0 +1,9 @@
+line 1 is not part of the list
+
+	this is point 1
+	this is point 2
+	this is point 3
+	this is point 4
+	this is point 5
+
+line 6 is not part of the list
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results4.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results4.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input1_results4.html	(revision 1000)
@@ -0,0 +1,7 @@
+line 1 is not part of the list
+this is point 1

+this is point 2

+this is point 3

+this is point 4

+this is point 5

+line 6 is not part of the list
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input2.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input2.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input2.html	(revision 1000)
@@ -0,0 +1,13 @@
+
+	list item 1
+	
+		list item 2

+		
+			list item 3
+			list item 4
+		
+		
+	
+	
+	list item 5
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input2_results1.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input2_results1.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input2_results1.html	(revision 1000)
@@ -0,0 +1,9 @@
+
+	list item 1
+
+list item 2
+
+	list item 3
+	list item 4
+	list item 5
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input3.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input3.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input3.html	(revision 1000)
@@ -0,0 +1,1 @@
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input3_results1.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input3_results1.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input3_results1.html	(revision 1000)
@@ -0,0 +1,3 @@
+
+	
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input4.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input4.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input4.html	(revision 1000)
@@ -0,0 +1,3 @@
+
+
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input4_results1.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input4_results1.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input4_results1.html	(revision 1000)
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input5.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input5.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input5.html	(revision 1000)
@@ -0,0 +1,7 @@
+
+	Line 1
+	
+	Line 2
+	
+	Line 3
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input5_results1.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input5_results1.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input5_results1.html	(revision 1000)
@@ -0,0 +1,7 @@
+
+	Line 1
+
+Line 2
+
+	Line 3
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input6.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input6.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input6.html	(revision 1000)
@@ -0,0 +1,5 @@
+Line 1
+
+	Line 2
+
+Line 3
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input6_results1.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input6_results1.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input6_results1.html	(revision 1000)
@@ -0,0 +1,5 @@
+
+	Line 1
+	Line 2
+	Line 3
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input7.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input7.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input7.html	(revision 1000)
@@ -0,0 +1,1 @@
+Test
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input7_results1.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input7_results1.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input7_results1.html	(revision 1000)
@@ -0,0 +1,3 @@
+
+	Test
+
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input8.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input8.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input8.html	(revision 1000)
@@ -0,0 +1,1 @@
+Test
Index: /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input8_results1.html
===================================================================
--- /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input8_results1.html	(revision 1000)
+++ /FCKeditor/branches/features/selenium-tests/_test/selenium/tests/html/test_list_input8_results1.html	(revision 1000)
@@ -0,0 +1,3 @@
+
+	Test
+
Index: /FCKeditor/branches/features/selenium-tests/editor/_source/internals/fckdomtools.js
===================================================================
--- /FCKeditor/branches/features/selenium-tests/editor/_source/internals/fckdomtools.js	(revision 999)
+++ /FCKeditor/branches/features/selenium-tests/editor/_source/internals/fckdomtools.js	(revision 1000)
@@ -758,5 +758,11 @@
 					currentListItem.appendChild( item.contents[i].cloneNode( true ) ) ;
 				if ( currentListItem.nodeType == 11 )
+				{
+					if ( currentListItem.lastChild && 
+							currentListItem.lastChild.getAttribute &&
+							currentListItem.lastChild.getAttribute( 'type' ) == '_moz' )
+						currentListItem.removeChild( currentListItem.lastChild );
 					currentListItem.appendChild( doc.createElement( 'br' ) ) ;
+				}
 				if ( currentListItem.nodeName.IEquals( FCKConfig.EnterMode ) && currentListItem.firstChild )
 				{