[gobo-eiffel-commits] gobo/test/xml/xpath xm_xpath_test_avg.e,1.3,1.4 xm_xpath_test_builder.e,1.24,1.25 xm_xpath_test_name_pool.e,1.20,1.21

[Eric B. <er...@us...>]

Update of /cvsroot/gobo-eiffel/gobo/test/xml/xpath
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1100/test/xml/xpath

Modified Files:
	xm_xpath_test_avg.e xm_xpath_test_builder.e 
	xm_xpath_test_name_pool.e 
Log Message:
Better assertions for string comparisons

Index: xm_xpath_test_builder.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/test/xml/xpath/xm_xpath_test_builder.e,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** xm_xpath_test_builder.e	8 Nov 2005 06:10:13 -0000	1.24
--- xm_xpath_test_builder.e	20 Mar 2006 23:41:56 -0000	1.25
***************
*** 54,58 ****
  			assert ("Document element not void", document_element /= Void)
  			a_name := document_element.node_name
! 			assert("root name", STRING_.same_string (a_name, "doc"))
  
  			-- Test last_child
--- 54,58 ----
  			assert ("Document element not void", document_element /= Void)
  			a_name := document_element.node_name
! 			assert_strings_equal ("root name", "doc", a_name)
  
  			-- Test last_child
***************
*** 61,65 ****
  			assert ("Last child not void", an_element /= Void)
  			a_name := an_element.node_name
! 			assert("Last child name", STRING_.same_string (a_name, "b"))
  
  			-- Test first_child
--- 61,65 ----
  			assert ("Last child not void", an_element /= Void)
  			a_name := an_element.node_name
! 			assert_strings_equal ("Last child name", "b", a_name)
  
  			-- Test first_child
***************
*** 68,86 ****
  			assert ("First child not void", an_element /= Void)
  			a_name := an_element.node_name
! 			assert("First child name", STRING_.same_string (a_name, "a"))
! 			
  			-- Test next_sibling
  
  			an_element ?= an_element.next_sibling
! 			assert ("Second child not void", an_element /= Void)			
  			a_name := an_element.node_name
! 			assert("Second child name", STRING_.same_string (a_name, "b"))
  
  			-- Test previous_sibling
  
  			an_element ?= an_element.previous_sibling
! 			assert ("Previous sibling not void", an_element /= Void)			
  			a_name := an_element.node_name
! 			assert("Previous sibling name", STRING_.same_string (a_name, "a"))						
  		end
  
--- 68,86 ----
  			assert ("First child not void", an_element /= Void)
  			a_name := an_element.node_name
! 			assert_strings_equal ("First child name", "a", a_name)
! 
  			-- Test next_sibling
  
  			an_element ?= an_element.next_sibling
! 			assert ("Second child not void", an_element /= Void)
  			a_name := an_element.node_name
! 			assert_strings_equal ("Second child name", "b", a_name)
  
  			-- Test previous_sibling
  
  			an_element ?= an_element.previous_sibling
! 			assert ("Previous sibling not void", an_element /= Void)
  			a_name := an_element.node_name
! 			assert_strings_equal ("Previous sibling name", "a", a_name)
  		end
  
***************
*** 118,122 ****
  			assert ("Document element not void", document_element /= Void)
  			a_name := document_element.node_name
! 			assert("root name", STRING_.same_string (a_name, "BOOKLIST"))
  
  			-- Test first_child
--- 118,122 ----
  			assert ("Document element not void", document_element /= Void)
  			a_name := document_element.node_name
! 			assert_strings_equal ("root name", "BOOKLIST", a_name)
  
  			-- Test first_child
***************
*** 125,129 ****
  			assert ("First child not void", books_element /= Void)
  			a_name := books_element.node_name
! 			assert("First child name", STRING_.same_string (a_name, "BOOKS"))
  
  			-- Test parent
--- 125,129 ----
  			assert ("First child not void", books_element /= Void)
  			a_name := books_element.node_name
! 			assert_strings_equal ("First child name", "BOOKS", a_name)
  
  			-- Test parent
***************
*** 136,140 ****
  			assert ("First child not void", item_element /= Void)
  			a_name := item_element.node_name
! 			assert("First child 2 name", STRING_.same_string (a_name, "ITEM"))
  			
  			-- Test next_sibling loop to last child
--- 136,140 ----
  			assert ("First child not void", item_element /= Void)
  			a_name := item_element.node_name
! 			assert_strings_equal ("First child 2 name", "ITEM", a_name)
  			
  			-- Test next_sibling loop to last child
***************
*** 153,157 ****
  				if an_element /= Void then
  					a_name := an_element.node_name
! 					assert("Sibling name", STRING_.same_string (a_name, "ITEM"))
  					counter := counter + 1
  				end
--- 153,157 ----
  				if an_element /= Void then
  					a_name := an_element.node_name
! 					assert_strings_equal ("Sibling name", "ITEM", a_name)
  					counter := counter + 1
  				end
***************
*** 190,194 ****
  					element_ancestor: an_element /= Void
  				end
! 			assert ("BOOKLIST ancestor", STRING_.same_string (an_element.node_name, "BOOKLIST"))
  
  			-- Test all_elements
--- 190,194 ----
  					element_ancestor: an_element /= Void
  				end
! 			assert_strings_equal ("BOOKLIST ancestor", "BOOKLIST", an_element.node_name)
  
  			-- Test all_elements
***************
*** 275,280 ****
  				end
  
! 			assert ("NOTE attribute", STRING_.same_string (an_attribute.node_name, "NOTE"))
! 			assert ("NOTE attribute value", STRING_.same_string (an_attribute.string_value, "Limited Stock"))
  
  			-- Test all_elements - cached result
--- 275,280 ----
  				end
  
! 			assert_strings_equal ("NOTE attribute", "NOTE", an_attribute.node_name)
! 			assert_strings_equal ("NOTE attribute value", "Limited Stock", an_attribute.string_value)
  
  			-- Test all_elements - cached result
***************
*** 308,312 ****
  			assert ("Document element not void", document_element /= Void)
  			a_name := document_element.node_name
! 			assert("root name", STRING_.same_string (a_name, "BOOKLIST"))
  		end
  
--- 308,312 ----
  			assert ("Document element not void", document_element /= Void)
  			a_name := document_element.node_name
! 			assert_strings_equal ("root name", "BOOKLIST", a_name)
  		end
  
***************
*** 341,346 ****
  			-- Name of directory containing data files
  		once
! 			Result := file_system.nested_pathname ("${GOBO}",
! 																<<"test", "xml", "xpath", "data">>)
  			Result := Execution_environment.interpreted_string (Result)
  		ensure
--- 341,345 ----
  			-- Name of directory containing data files
  		once
! 			Result := file_system.nested_pathname ("${GOBO}", <<"test", "xml", "xpath", "data">>)
  			Result := Execution_environment.interpreted_string (Result)
  		ensure

Index: xm_xpath_test_name_pool.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/test/xml/xpath/xm_xpath_test_name_pool.e,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** xm_xpath_test_name_pool.e	28 Sep 2005 09:32:54 -0000	1.20
--- xm_xpath_test_name_pool.e	20 Mar 2006 23:41:56 -0000	1.21
***************
*** 81,85 ****
  			assert ("Positive name code", name_code > 0)
  			an_xml_prefix := shared_name_pool.prefix_from_name_code (name_code)
! 			assert ("Prefix", an_xml_prefix /= Void and then STRING_.same_string (an_xml_prefix, "test3"))
  			prefix_code := shared_name_pool.code_for_prefix ("test3")
  			assert ("Prefix code 2", prefix_code > 0)
--- 81,86 ----
  			assert ("Positive name code", name_code > 0)
  			an_xml_prefix := shared_name_pool.prefix_from_name_code (name_code)
! 			assert ("prefix_not_void", an_xml_prefix /= Void)
! 			assert_strings_equal ("prefix", "test3", an_xml_prefix)
  			prefix_code := shared_name_pool.code_for_prefix ("test3")
  			assert ("Prefix code 2", prefix_code > 0)
***************
*** 89,103 ****
  			assert ("URI code", uri_code > 0)
  			namespace_uri := shared_name_pool.namespace_uri_from_name_code (name_code)
! 			assert ("Namespace URI", namespace_uri /= Void and then STRING_.same_string (namespace_uri, testing_namespace))
  			local_name := shared_name_pool.local_name_from_name_code (name_code)
! 			assert ("Local name", local_name /= Void and then STRING_.same_string (local_name, "test3"))
  			display_name := shared_name_pool.display_name_from_name_code (name_code)
! 			assert ("Display name", display_name /= Void and then STRING_.same_string (display_name, "test3:test3"))
  			namespace_uri := shared_name_pool.uri_from_namespace_code (namespace_code)
! 			assert ("Namespace URI 2", namespace_uri /= Void and then STRING_.same_string (namespace_uri, testing_namespace))
  			namespace_uri := shared_name_pool.uri_from_uri_code (uri_code)
  			assert ("Namespace URI 3", STRING_.same_string (namespace_uri, testing_namespace))
  			an_xml_prefix := shared_name_pool.prefix_from_namespace_code (namespace_code)
! 			assert ("Prefix 2",  an_xml_prefix /= Void and then STRING_.same_string (an_xml_prefix, "test3"))
  		end
  
--- 90,109 ----
  			assert ("URI code", uri_code > 0)
  			namespace_uri := shared_name_pool.namespace_uri_from_name_code (name_code)
! 			assert ("namespace_uri_not_void", namespace_uri /= Void)
! 			assert_strings_equal ("Namespace URI", testing_namespace, namespace_uri)
  			local_name := shared_name_pool.local_name_from_name_code (name_code)
! 			assert ("local_name_not_void", local_name /= Void)
! 			assert_strings_equal ("Local name", "test3", local_name)
  			display_name := shared_name_pool.display_name_from_name_code (name_code)
! 			assert ("display_name_not_void", display_name /= Void)
! 			assert_strings_equal ("Display name", "test3:test3", display_name)
  			namespace_uri := shared_name_pool.uri_from_namespace_code (namespace_code)
! 			assert ("namespace_uri_not_void_2", namespace_uri /= Void)
! 			assert_strings_equal ("Namespace URI 2", testing_namespace, namespace_uri)
  			namespace_uri := shared_name_pool.uri_from_uri_code (uri_code)
  			assert ("Namespace URI 3", STRING_.same_string (namespace_uri, testing_namespace))
  			an_xml_prefix := shared_name_pool.prefix_from_namespace_code (namespace_code)
! 			assert ("prefix_not_void_2", an_xml_prefix /= Void)
! 			assert_strings_equal ("Prefix 2", "test3", an_xml_prefix)
  		end
  
***************
*** 122,126 ****
  		do
  			suggestion := shared_name_pool.suggested_prefix_for_uri (Xslt_uri)
! 			assert ("Suggestion", STRING_.same_string (suggestion, "xsl"))
  			shared_name_pool.allocate_name ("test4", testing_namespace, "test4")
  			fingerprint := shared_name_pool.fingerprint (testing_namespace, "test4")
--- 128,132 ----
  		do
  			suggestion := shared_name_pool.suggested_prefix_for_uri (Xslt_uri)
! 			assert_strings_equal ("Suggestion", "xsl", suggestion)
  			shared_name_pool.allocate_name ("test4", testing_namespace, "test4")
  			fingerprint := shared_name_pool.fingerprint (testing_namespace, "test4")
***************
*** 132,136 ****
  	-- still to test:
  	--  allocate_document_number
! 	
  feature -- Setting
  
--- 138,142 ----
  	-- still to test:
  	--  allocate_document_number
! 
  feature -- Setting
  
***************
*** 145,147 ****
--- 151,154 ----
  			--			default_pool.diagnostic_dump
  --		end
+ 
  end

Index: xm_xpath_test_avg.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/test/xml/xpath/xm_xpath_test_avg.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xm_xpath_test_avg.e	21 Oct 2005 08:31:49 -0000	1.3
--- xm_xpath_test_avg.e	20 Mar 2006 23:41:56 -0000	1.4
***************
*** 114,118 ****
  			an_evaluator.evaluate ("avg(('a', 5))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert ("FORG0006", STRING_.same_string (an_evaluator.error_value.code, "FORG0006"))
  		end
  
--- 114,118 ----
  			an_evaluator.evaluate ("avg(('a', 5))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert_strings_equal ("FORG0006", "FORG0006", an_evaluator.error_value.code)
  		end
  
***************
*** 128,132 ****
  			an_evaluator.evaluate ("avg(((3, 4, 5), xdt:yearMonthDuration('P10M')))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert ("FORG0006", STRING_.same_string (an_evaluator.error_value.code, "FORG0006"))
  		end
  
--- 128,132 ----
  			an_evaluator.evaluate ("avg(((3, 4, 5), xdt:yearMonthDuration('P10M')))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert_strings_equal ("FORG0006", "FORG0006", an_evaluator.error_value.code)
  		end
  
***************
*** 258,262 ****
  			an_evaluator.evaluate ("sum((xdt:yearMonthDuration('P20Y'), 9E1))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert ("FORG0006", STRING_.same_string (an_evaluator.error_value.code, "FORG0006"))
  		end
  
--- 258,262 ----
  			an_evaluator.evaluate ("sum((xdt:yearMonthDuration('P20Y'), 9E1))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert_strings_equal ("FORG0006", "FORG0006", an_evaluator.error_value.code)
  		end
  
***************
*** 312,316 ****
  			an_evaluator.evaluate ("max((3,4,'Zero'))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert ("FORG0006", STRING_.same_string (an_evaluator.error_value.code, "FORG0006"))
  		end
  
--- 312,316 ----
  			an_evaluator.evaluate ("max((3,4,'Zero'))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert_strings_equal ("FORG0006", "FORG0006", an_evaluator.error_value.code)
  		end
  
***************
*** 357,361 ****
  			a_string_value ?= evaluated_items.item (1)
  			assert ("String value", a_string_value /= Void)
! 			assert ("Result is c", STRING_.same_string ("c", a_string_value.string_value))
  		end
  
--- 357,361 ----
  			a_string_value ?= evaluated_items.item (1)
  			assert ("String value", a_string_value /= Void)
! 			assert_strings_equal ("Result is c", "c", a_string_value.string_value)
  		end
  
***************
*** 411,415 ****
  			an_evaluator.evaluate ("min((3,4,'Zero'))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert ("FORG0006", STRING_.same_string (an_evaluator.error_value.code, "FORG0006"))
  		end
  
--- 411,415 ----
  			an_evaluator.evaluate ("min((3,4,'Zero'))")
  			assert ("Evaluation error", an_evaluator.is_error)
! 			assert_strings_equal ("FORG0006", "FORG0006", an_evaluator.error_value.code)
  		end
  
***************
*** 456,460 ****
  			a_string_value ?= evaluated_items.item (1)
  			assert ("String value", a_string_value /= Void)
! 			assert ("Result is a", STRING_.same_string ("a", a_string_value.string_value))
  		end
  
--- 456,460 ----
  			a_string_value ?= evaluated_items.item (1)
  			assert ("String value", a_string_value /= Void)
! 			assert ("Result is a", "a", a_string_value.string_value)
  		end