netsurf-commits June 2014

netsurf-commits@netsurf-browser.org

1 participants
98 discussions

libdom: branch rupindersingh/libdom updated. release/0.1.0-43-ga3bba72

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/a3bba726a05d1c4e642591... ...commit http://git.netsurf-browser.org/libdom.git/commit/a3bba726a05d1c4e642591ac... ...tree http://git.netsurf-browser.org/libdom.git/tree/a3bba726a05d1c4e642591ac93... The branch, rupindersingh/libdom has been updated via a3bba726a05d1c4e642591ac930d313b02f4cb3d (commit) via 29172c690b8fdc7e0b029e56ec8ede10d293d1b8 (commit) from f9bfe2c42e3e259cd2f65932bffa52f49e0238ca (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=a3bba726a05d1c4e6425... commit a3bba726a05d1c4e642591ac930d313b02f4cb3d Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> Frame Element without the contentDocument diff --git a/Makefile b/Makefile index 2de8d0c..4dc8af6 100644 --- a/Makefile +++ b/Makefile @@ -132,6 +132,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablerow_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_base_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_style_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frameset_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frame_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 376ef14..d8245ac 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -91,6 +91,7 @@ #include <dom/html/html_base_element.h> #include <dom/html/html_style_element.h> #include <dom/html/html_frameset_element.h> +#include <dom/html/html_frame_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_frame_element.h b/include/dom/html/html_frame_element.h index 2e182d5..95d8b48 100644 --- a/include/dom/html/html_frame_element.h +++ b/include/dom/html/html_frame_element.h @@ -3,5 +3,64 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_frame_element_h_ +#define dom_html_frame_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +#include <dom/html/html_document.h> +typedef struct dom_html_frame_element dom_html_frame_element; + +dom_exception dom_html_frame_element_get_frame_border( + dom_html_frame_element *element, dom_string **frame_border); + +dom_exception dom_html_frame_element_set_frame_border( + dom_html_frame_element *element, dom_string *frame_border); + +dom_exception dom_html_frame_element_set_long_desc( + dom_html_frame_element *ele, dom_string *long_desc); + +dom_exception dom_html_frame_element_get_long_desc( + dom_html_frame_element *ele, dom_string **long_desc); + +dom_exception dom_html_frame_element_get_margin_height( + dom_html_frame_element *element, dom_string **margin_height); + +dom_exception dom_html_frame_element_set_margin_height( + dom_html_frame_element *element, dom_string *margin_height); + +dom_exception dom_html_frame_element_get_margin_width( + dom_html_frame_element *element, dom_string **margin_width); + +dom_exception dom_html_frame_element_set_margin_width( + dom_html_frame_element *element, dom_string *margin_width); + +dom_exception dom_html_frame_element_get_name( + dom_html_frame_element *element, dom_string **name); + +dom_exception dom_html_frame_element_set_name( + dom_html_frame_element *element, dom_string *name); + +dom_exception dom_html_frame_element_get_scrolling( + dom_html_frame_element *element, dom_string **scrolling); + +dom_exception dom_html_frame_element_set_scrolling( + dom_html_frame_element *element, dom_string *scrolling); + +dom_exception dom_html_frame_element_get_src( + dom_html_frame_element *element, dom_string **src); + +dom_exception dom_html_frame_element_set_src( + dom_html_frame_element *element, dom_string *src); + +dom_exception dom_html_frame_element_set_no_resize(dom_html_frame_element *ele, + bool no_resize); + +dom_exception dom_html_frame_element_get_no_resize(dom_html_frame_element *ele, + bool *no_resize); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index a9532cd..fa707d4 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -17,10 +17,11 @@ DIR_SOURCES := \ html_param_element.c html_applet_element.c html_area_element.c \ html_map_element.c html_script_element.c html_tablecaption_element.c \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ - html_table_element.c html_tablerow_element.c html_frameset_element.c + html_table_element.c html_tablerow_element.c html_frameset_element.c \ + html_frame_element.c UNINMPLEMENTED_SOURCES := \ html_isindex_element.c \ - html_frame_element.c html_iframe_element.c + html_iframe_element.c include $(NSBUILD)/Makefile.subdir diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 10ec80d..35fca73 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -108,6 +108,7 @@ HTML_DOCUMENT_STRINGS_ACTION1(summary) HTML_DOCUMENT_STRINGS_ACTION1(prompt) HTML_DOCUMENT_STRINGS_ACTION1(rows) HTML_DOCUMENT_STRINGS_ACTION1(cols) +HTML_DOCUMENT_STRINGS_ACTION1(scrolling) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) @@ -120,6 +121,9 @@ HTML_DOCUMENT_STRINGS_ACTION(ch,char) HTML_DOCUMENT_STRINGS_ACTION(ch_off,charoff) HTML_DOCUMENT_STRINGS_ACTION(cell_padding,cellpadding) HTML_DOCUMENT_STRINGS_ACTION(cell_spacing,cellspacing) +HTML_DOCUMENT_STRINGS_ACTION(frame_border,frameborder) +HTML_DOCUMENT_STRINGS_ACTION(margin_height,marginheight) +HTML_DOCUMENT_STRINGS_ACTION(margin_width,marginwidth) /* HTML_DOCUMENT_STRINGS_ACTION1(type) */ HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap) /* HTML_DOCUMENT_STRINGS_ACTION1(value) */ diff --git a/src/html/html_frame_element.c b/src/html/html_frame_element.c index 2e182d5..23d9a92 100644 --- a/src/html/html_frame_element.c +++ b/src/html/html_frame_element.c @@ -3,5 +3,278 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> + +#include <dom/html/html_frame_element.h> + +#include "html/html_document.h" +#include "html/html_frame_element.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_FRAME_ELEMENT + }, + DOM_HTML_FRAME_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_frame_element object + * + * \param doc The document object + * \param ele The returned element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_frame_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_frame_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_frame_element object + * + * \param doc The document object + * \param ele The dom_html_frame_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element *ele) +{ + dom_string *scrolling_default = NULL; + dom_exception err; + err = dom_string_create((const uint8_t *) "auto", SLEN("auto"), &scrolling_default); + if (err != DOM_NO_ERR) + return err; + + + dom_string *frame_border_default = NULL; + err = dom_string_create((const uint8_t *) "1", SLEN("1"), &frame_border_default); + if (err != DOM_NO_ERR) + return err; + + err = _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_FRAME], + namespace, prefix); + + ele->scrolling_default = scrolling_default; + ele->frame_border_default = frame_border_default; + + return err; +} + +/** + * Finalise a dom_html_frame_element object + * + * \param ele The dom_html_frame_element object + */ +void _dom_html_frame_element_finalise(struct dom_html_frame_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_frame_element object + * + * \param ele The dom_html_frame_element object + */ +void _dom_html_frame_element_destroy(struct dom_html_frame_element *ele) +{ + _dom_html_frame_element_finalise(ele); + free(ele); +} + +/** + * Get the no_resize property + * + * \param ele The dom_html_frame_element object + * \param no_resize The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_get_no_resize(dom_html_frame_element *ele, + bool *no_resize) +{ + return dom_html_element_get_bool_property(&ele->base, "noresize", + SLEN("noresize"), no_resize); +} + +/** + * Set the no_resize property + * + * \param ele The dom_html_frame_element object + * \param no_resize The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_set_no_resize(dom_html_frame_element *ele, + bool no_resize) +{ + return dom_html_element_set_bool_property(&ele->base, "noresize", + SLEN("noresize"), no_resize); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_frame_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_frame_element_destroy(dom_node_internal *node) +{ + _dom_html_frame_element_destroy((struct dom_html_frame_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_frame_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_frame_element_get_##attr( \ + dom_html_frame_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_frame_element_set_##attr( \ + dom_html_frame_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_GET_SET(long_desc); +SIMPLE_GET_SET(name); +SIMPLE_GET_SET(src); +SIMPLE_SET(frame_border); +SIMPLE_GET_SET(margin_width); +SIMPLE_GET_SET(margin_height); +SIMPLE_SET(scrolling); + + +/** + * Get the frame_border property + * + * \param ele The dom_html_frame_element object + * \param frame_border The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_get_frame_border( + dom_html_frame_element *ele, + dom_string **frame_border) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_frame_border], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_frame_border], frame_border); + } + + *frame_border = ele->frame_border_default; + if (*frame_border != NULL) + dom_string_ref(*frame_border); + return DOM_NO_ERR; +} + +/** + * Get the frame_border property + * + * \param ele The dom_html_frame_element object + * \param scrolling The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_get_scrolling( + dom_html_frame_element *ele, + dom_string **scrolling) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_scrolling], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_scrolling], scrolling); + } + + *scrolling = ele->scrolling_default; + if (*scrolling != NULL) + dom_string_ref(*scrolling); + return DOM_NO_ERR; +} + diff --git a/src/html/html_frame_element.h b/src/html/html_frame_element.h index 2e182d5..77a137b 100644 --- a/src/html/html_frame_element.h +++ b/src/html/html_frame_element.h @@ -3,5 +3,52 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_frame_element_h_ +#define dom_internal_html_frame_element_h_ + +#include <dom/html/html_frameset_element.h> +#include "html/html_element.h" + + +struct dom_html_frame_element { + struct dom_html_element base; + /**< The base class */ + dom_string *scrolling_default; + dom_string *frame_border_default; +}; + +/* Create a dom_html_frame_element object */ +dom_exception _dom_html_frame_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element **ele); + +/* Initialise a dom_html_frame_element object */ +dom_exception _dom_html_frame_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element *ele); + +/* Finalise a dom_html_frame_element object */ +void _dom_html_frame_element_finalise(struct dom_html_frame_element *ele); + +/* Destroy a dom_html_frame_element object */ +void _dom_html_frame_element_destroy(struct dom_html_frame_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_frame_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_frame_element_destroy(dom_node_internal *node); +dom_exception _dom_html_frame_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_FRAME_ELEMENT_PROTECT_VTABLE \ + _dom_html_frame_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_FRAME_ELEMENT \ + _dom_virtual_html_frame_element_destroy, \ + _dom_html_frame_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLFrameElement01.xml b/test/testcases/tests/level1/html/HTMLFrameElement01.xml new file mode 100644 index 0000000..e74ef5e --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement01.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement01"> +<metadata> +<title>HTMLFrameElement01</title> +<creator>NIST</creator> +<description> + The frameBorder attribute specifies the request for frame borders. + (frameBorder=1 A border is drawn) + (FrameBorder=0 A border is not drawn) + + Retrieve the frameBorder attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1185..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vframeborder" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<frameBorder interface="HTMLFrameElement" obj="testNode" var="vframeborder"/> +<assertEquals actual="vframeborder" expected='"1"' id="frameborderLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail deleted file mode 100644 index e74ef5e..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement01"> -<metadata> -<title>HTMLFrameElement01</title> -<creator>NIST</creator> -<description> - The frameBorder attribute specifies the request for frame borders. - (frameBorder=1 A border is drawn) - (FrameBorder=0 A border is not drawn) - - Retrieve the frameBorder attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1185..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vframeborder" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<frameBorder interface="HTMLFrameElement" obj="testNode" var="vframeborder"/> -<assertEquals actual="vframeborder" expected='"1"' id="frameborderLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement02.xml b/test/testcases/tests/level1/html/HTMLFrameElement02.xml new file mode 100644 index 0000000..e6197e7 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement02.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement02"> +<metadata> +<title>HTMLFrameElement02</title> +<creator>NIST</creator> +<description> + The longDesc attribute specifies a URI designating a long description + of this image or frame. + + Retrieve the longDesc attribute of the first FRAME element and examine + its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836998"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vlongdesc" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<longDesc interface="HTMLFrameElement" obj="testNode" var="vlongdesc"/> +<assertEquals actual="vlongdesc" expected='"about:blank"' ignoreCase="false" id="longdescLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail deleted file mode 100644 index e6197e7..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement02"> -<metadata> -<title>HTMLFrameElement02</title> -<creator>NIST</creator> -<description> - The longDesc attribute specifies a URI designating a long description - of this image or frame. - - Retrieve the longDesc attribute of the first FRAME element and examine - its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836998"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vlongdesc" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<longDesc interface="HTMLFrameElement" obj="testNode" var="vlongdesc"/> -<assertEquals actual="vlongdesc" expected='"about:blank"' ignoreCase="false" id="longdescLink"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement03.xml b/test/testcases/tests/level1/html/HTMLFrameElement03.xml new file mode 100644 index 0000000..601ad32 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement03.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement03"> +<metadata> +<title>HTMLFrameElement03</title> +<creator>NIST</creator> +<description> + The marginHeight attribute specifies the frame margin height, in pixels. + + Retrieve the marginHeight attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5556..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vmarginheight" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<marginHeight interface="HTMLFrameElement" obj="testNode" var="vmarginheight"/> +<assertEquals actual="vmarginheight" expected='"10"' id="marginheightLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail deleted file mode 100644 index 601ad32..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement03"> -<metadata> -<title>HTMLFrameElement03</title> -<creator>NIST</creator> -<description> - The marginHeight attribute specifies the frame margin height, in pixels. - - Retrieve the marginHeight attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5556..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vmarginheight" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<marginHeight interface="HTMLFrameElement" obj="testNode" var="vmarginheight"/> -<assertEquals actual="vmarginheight" expected='"10"' id="marginheightLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement04.xml b/test/testcases/tests/level1/html/HTMLFrameElement04.xml new file mode 100644 index 0000000..85a6b3e --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement04.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement04"> +<metadata> +<title>HTMLFrameElement04</title> +<creator>NIST</creator> +<description> + The marginWidth attribute specifies the frame margin width, in pixels. + + Retrieve the marginWidth attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8369969"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vmarginwidth" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<marginWidth interface="HTMLFrameElement" obj="testNode" var="vmarginwidth"/> +<assertEquals actual="vmarginwidth" expected='"5"' id="marginwidthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail deleted file mode 100644 index 85a6b3e..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement04"> -<metadata> -<title>HTMLFrameElement04</title> -<creator>NIST</creator> -<description> - The marginWidth attribute specifies the frame margin width, in pixels. - - Retrieve the marginWidth attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8369969"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vmarginwidth" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<marginWidth interface="HTMLFrameElement" obj="testNode" var="vmarginwidth"/> -<assertEquals actual="vmarginwidth" expected='"5"' id="marginwidthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement05.xml b/test/testcases/tests/level1/html/HTMLFrameElement05.xml new file mode 100644 index 0000000..8df7700 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement05.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement05"> +<metadata> +<title>HTMLFrameElement05</title> +<creator>NIST</creator> +<description> + The name attribute specifies the frame name(object of the target + attribute). + + Retrieve the name attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9112..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vname" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<name interface="HTMLFrameElement" obj="testNode" var="vname"/> +<assertEquals actual="vname" expected='"Frame1"' id="nameLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail deleted file mode 100644 index 8df7700..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement05"> -<metadata> -<title>HTMLFrameElement05</title> -<creator>NIST</creator> -<description> - The name attribute specifies the frame name(object of the target - attribute). - - Retrieve the name attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9112..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vname" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<name interface="HTMLFrameElement" obj="testNode" var="vname"/> -<assertEquals actual="vname" expected='"Frame1"' id="nameLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement06.xml b/test/testcases/tests/level1/html/HTMLFrameElement06.xml new file mode 100644 index 0000000..43f46e1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement06.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement06"> +<metadata> +<title>HTMLFrameElement06</title> +<creator>NIST</creator> +<description> + The noResize attribute specifies if the user can resize the frame. When + true, forbid user from resizing frame. + + Retrieve the noResize attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8076..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vnoresize" type="boolean" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<noResize interface="HTMLFrameElement" obj="testNode" var="vnoresize"/> +<assertTrue actual="vnoresize" id="noresizeLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail deleted file mode 100644 index 43f46e1..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement06"> -<metadata> -<title>HTMLFrameElement06</title> -<creator>NIST</creator> -<description> - The noResize attribute specifies if the user can resize the frame. When - true, forbid user from resizing frame. - - Retrieve the noResize attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8076..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vnoresize" type="boolean" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<noResize interface="HTMLFrameElement" obj="testNode" var="vnoresize"/> -<assertTrue actual="vnoresize" id="noresizeLink"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement07.xml b/test/testcases/tests/level1/html/HTMLFrameElement07.xml new file mode 100644 index 0000000..a7fdea4 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement07.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement07"> +<metadata> +<title>HTMLFrameElement07</title> +<creator>NIST</creator> +<description> + The scrolling attribute specifies whether or not the frame should have + scrollbars. + + Retrieve the scrolling attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4541..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vscrolling" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<scrolling interface="HTMLFrameElement" obj="testNode" var="vscrolling"/> +<assertEquals actual="vscrolling" expected='"yes"' id="scrollingLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail deleted file mode 100644 index a7fdea4..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement07"> -<metadata> -<title>HTMLFrameElement07</title> -<creator>NIST</creator> -<description> - The scrolling attribute specifies whether or not the frame should have - scrollbars. - - Retrieve the scrolling attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4541..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vscrolling" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<scrolling interface="HTMLFrameElement" obj="testNode" var="vscrolling"/> -<assertEquals actual="vscrolling" expected='"yes"' id="scrollingLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement08.xml b/test/testcases/tests/level1/html/HTMLFrameElement08.xml new file mode 100644 index 0000000..4b2843a --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement08.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement08"> +<metadata> +<title>HTMLFrameElement08</title> +<creator>NIST</creator> +<description> + The src attribute specifies a URI designating the initial frame contents. + + Retrieve the src attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7879..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsrc" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<src interface="HTMLFrameElement" obj="testNode" var="vsrc"/> +<assertURIEquals actual="vsrc" name='"right"' id="srcLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail deleted file mode 100644 index 4b2843a..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement08"> -<metadata> -<title>HTMLFrameElement08</title> -<creator>NIST</creator> -<description> - The src attribute specifies a URI designating the initial frame contents. - - Retrieve the src attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7879..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsrc" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<src interface="HTMLFrameElement" obj="testNode" var="vsrc"/> -<assertURIEquals actual="vsrc" name='"right"' id="srcLink"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=29172c690b8fdc7e0b02... commit 29172c690b8fdc7e0b029e56ec8ede10d293d1b8 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> FrameSet Element diff --git a/Makefile b/Makefile index 9b47c36..2de8d0c 100644 --- a/Makefile +++ b/Makefile @@ -131,6 +131,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_table_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablerow_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_base_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_style_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frameset_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 68ae227..376ef14 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -90,6 +90,7 @@ #include <dom/html/html_tablerow_element.h> #include <dom/html/html_base_element.h> #include <dom/html/html_style_element.h> +#include <dom/html/html_frameset_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_frameset_element.h b/include/dom/html/html_frameset_element.h index 2e182d5..c0de3b4 100644 --- a/include/dom/html/html_frameset_element.h +++ b/include/dom/html/html_frameset_element.h @@ -3,5 +3,27 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_frame_set_element_h_ +#define dom_html_frame_set_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +typedef struct dom_html_frame_set_element dom_html_frame_set_element; + +dom_exception dom_html_frame_set_element_get_rows( + dom_html_frame_set_element *element, dom_string **rows); + +dom_exception dom_html_frame_set_element_set_rows( + dom_html_frame_set_element *element, dom_string *rows); + +dom_exception dom_html_frame_set_element_set_cols( + dom_html_frame_set_element *ele, dom_string *cols); + +dom_exception dom_html_frame_set_element_get_cols( + dom_html_frame_set_element *ele, dom_string **cols); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 2cb85d9..a9532cd 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -17,10 +17,10 @@ DIR_SOURCES := \ html_param_element.c html_applet_element.c html_area_element.c \ html_map_element.c html_script_element.c html_tablecaption_element.c \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ - html_table_element.c html_tablerow_element.c + html_table_element.c html_tablerow_element.c html_frameset_element.c UNINMPLEMENTED_SOURCES := \ - html_frameset_element.c html_isindex_element.c \ + html_isindex_element.c \ html_frame_element.c html_iframe_element.c include $(NSBUILD)/Makefile.subdir diff --git a/src/html/html_document.c b/src/html/html_document.c index 0e39f77..a4ba62b 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -57,6 +57,7 @@ #include "html/html_table_element.h" #include "html/html_tablerow_element.h" #include "html/html_style_element.h" +#include "html/html_frameset_element.h" #include "core/attr.h" #include "core/string.h" @@ -365,6 +366,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_STYLE])) { exc = _dom_html_style_element_create(html, (dom_html_style_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_FRAMESET])) { + exc = _dom_html_frame_set_element_create(html, namespace, prefix, + (dom_html_frame_set_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 5d5ddaf..10ec80d 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -106,6 +106,8 @@ HTML_DOCUMENT_STRINGS_ACTION1(frame) HTML_DOCUMENT_STRINGS_ACTION1(rules) HTML_DOCUMENT_STRINGS_ACTION1(summary) HTML_DOCUMENT_STRINGS_ACTION1(prompt) +HTML_DOCUMENT_STRINGS_ACTION1(rows) +HTML_DOCUMENT_STRINGS_ACTION1(cols) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) diff --git a/src/html/html_frameset_element.c b/src/html/html_frameset_element.c index 2e182d5..b096156 100644 --- a/src/html/html_frameset_element.c +++ b/src/html/html_frameset_element.c @@ -3,5 +3,234 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> +#include <dom/html/html_frameset_element.h> + +#include "html/html_document.h" +#include "html/html_frameset_element.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_FRAME_SET_ELEMENT + }, + DOM_HTML_FRAME_SET_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_frame_set_element object + * + * \param doc The document object + * \param ele The returned element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_set_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_frame_set_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_frame_set_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_frame_set_element object + * + * \param doc The document object + * \param ele The dom_html_frame_set_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_set_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element *ele) +{ + dom_string *cols_rows_default = NULL; + dom_exception err; + err = dom_string_create((const uint8_t *) "100%", SLEN("100%"), &cols_rows_default); + if (err != DOM_NO_ERR) + return err; + + err = _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_FRAMESET], + namespace, prefix); + ele->cols_rows_default = cols_rows_default; + return err; +} + +/** + * Finalise a dom_html_frame_set_element object + * + * \param ele The dom_html_frame_set_element object + */ +void _dom_html_frame_set_element_finalise(struct dom_html_frame_set_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_frame_set_element object + * + * \param ele The dom_html_frame_set_element object + */ +void _dom_html_frame_set_element_destroy(struct dom_html_frame_set_element *ele) +{ + _dom_html_frame_set_element_finalise(ele); + free(ele); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_frame_set_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_frame_set_element_destroy(dom_node_internal *node) +{ + _dom_html_frame_set_element_destroy((struct dom_html_frame_set_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_frame_set_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_frame_set_element_get_##attr( \ + dom_html_frame_set_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_frame_set_element_set_##attr( \ + dom_html_frame_set_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_SET(rows); +SIMPLE_SET(cols); + +/** + * Get the rows property + * + * \param ele The dom_html_frame_set_element object + * \param rows The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_set_element_get_rows( + dom_html_frame_set_element *ele, + dom_string **rows) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_rows], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_rows], rows); + } + + *rows = ele->cols_rows_default; + if (*rows != NULL) + dom_string_ref(*rows); + + return DOM_NO_ERR; +} + +/** + * Get the cols property + * + * \param ele The dom_html_frame_set_element object + * \param cols The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_set_element_get_cols( + dom_html_frame_set_element *ele, + dom_string **cols) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_cols], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_cols], cols); + } + + *cols = ele->cols_rows_default; + if (*cols != NULL) + dom_string_ref(*cols); + return DOM_NO_ERR; +} diff --git a/src/html/html_frameset_element.h b/src/html/html_frameset_element.h index 2e182d5..fd1c255 100644 --- a/src/html/html_frameset_element.h +++ b/src/html/html_frameset_element.h @@ -3,5 +3,51 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_frame_set_element_h_ +#define dom_internal_html_frame_set_element_h_ + +#include <dom/html/html_frameset_element.h> +#include "html/html_element.h" + + +struct dom_html_frame_set_element { + struct dom_html_element base; + /**< The base class */ + dom_string *cols_rows_default; +}; + +/* Create a dom_html_frame_set_element object */ +dom_exception _dom_html_frame_set_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element **ele); + +/* Initialise a dom_html_frame_set_element object */ +dom_exception _dom_html_frame_set_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element *ele); + +/* Finalise a dom_html_frame_set_element object */ +void _dom_html_frame_set_element_finalise(struct dom_html_frame_set_element *ele); + +/* Destroy a dom_html_frame_set_element object */ +void _dom_html_frame_set_element_destroy(struct dom_html_frame_set_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_frame_set_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_frame_set_element_destroy(dom_node_internal *node); +dom_exception _dom_html_frame_set_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_FRAME_SET_ELEMENT_PROTECT_VTABLE \ + _dom_html_frame_set_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_FRAME_SET_ELEMENT \ + _dom_virtual_html_frame_set_element_destroy, \ + _dom_html_frame_set_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml new file mode 100644 index 0000000..18e5ff5 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameSetElement01"> +<metadata> +<title>HTMLFrameSetElement01</title> +<creator>NIST</creator> +<description> + The cols attribute specifies the number of columns of frames in the + frameset. + + Retrieve the cols attribute of the first FRAMESET element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9886..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcols" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frameset" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frameset"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<cols interface="HTMLFrameSetElement" obj="testNode" var="vcols"/> +<assertEquals actual="vcols" expected='"20, 80"' id="colsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail deleted file mode 100644 index 18e5ff5..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameSetElement01"> -<metadata> -<title>HTMLFrameSetElement01</title> -<creator>NIST</creator> -<description> - The cols attribute specifies the number of columns of frames in the - frameset. - - Retrieve the cols attribute of the first FRAMESET element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9886..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcols" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frameset" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frameset"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<cols interface="HTMLFrameSetElement" obj="testNode" var="vcols"/> -<assertEquals actual="vcols" expected='"20, 80"' id="colsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml new file mode 100644 index 0000000..e598cef --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameSetElement02"> +<metadata> +<title>HTMLFrameSetElement02</title> +<creator>NIST</creator> +<description> + The rows attribute specifies the number of rows of frames in the + frameset. + + Retrieve the rows attribute of the second FRAMESET element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1973..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vrows" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frameset" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frameset"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLFrameSetElement" obj="testNode" var="vrows"/> +<assertEquals actual="vrows" expected='"100, 200"' id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail deleted file mode 100644 index e598cef..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameSetElement02"> -<metadata> -<title>HTMLFrameSetElement02</title> -<creator>NIST</creator> -<description> - The rows attribute specifies the number of rows of frames in the - frameset. - - Retrieve the rows attribute of the second FRAMESET element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1973..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vrows" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frameset" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frameset"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLFrameSetElement" obj="testNode" var="vrows"/> -<assertEquals actual="vrows" expected='"100, 200"' id="rowsLink" ignoreCase="false"/> -</test> ----------------------------------------------------------------------- Summary of changes: Makefile | 2 + include/dom/dom.h | 2 + include/dom/html/html_frame_element.h | 59 +++++ include/dom/html/html_frameset_element.h | 22 ++ src/html/Makefile | 7 +- src/html/html_document.c | 4 + src/html/html_document_strings.h | 6 + src/html/html_frame_element.c | 273 ++++++++++++++++++++ src/html/html_frame_element.h | 47 ++++ src/html/html_frameset_element.c | 229 ++++++++++++++++ src/html/html_frameset_element.h | 46 ++++ ...eElement01.xml.kfail => HTMLFrameElement01.xml} | 0 ...eElement02.xml.kfail => HTMLFrameElement02.xml} | 0 ...eElement03.xml.kfail => HTMLFrameElement03.xml} | 0 ...eElement04.xml.kfail => HTMLFrameElement04.xml} | 0 ...eElement05.xml.kfail => HTMLFrameElement05.xml} | 0 ...eElement06.xml.kfail => HTMLFrameElement06.xml} | 0 ...eElement07.xml.kfail => HTMLFrameElement07.xml} | 0 ...eElement08.xml.kfail => HTMLFrameElement08.xml} | 0 ...ement01.xml.kfail => HTMLFrameSetElement01.xml} | 0 ...ement02.xml.kfail => HTMLFrameSetElement02.xml} | 0 21 files changed, 694 insertions(+), 3 deletions(-) rename test/testcases/tests/level1/html/{HTMLFrameElement01.xml.kfail => HTMLFrameElement01.xml} (100%) rename test/testcases/tests/level1/html/{HTMLFrameElement02.xml.kfail => HTMLFrameElement02.xml} (100%) rename test/testcases/tests/level1/html/{HTMLFrameElement03.xml.kfail => HTMLFrameElement03.xml} (100%) rename test/testcases/tests/level1/html/{HTMLFrameElement04.xml.kfail => HTMLFrameElement04.xml} (100%) rename test/testcases/tests/level1/html/{HTMLFrameElement05.xml.kfail => HTMLFrameElement05.xml} (100%) rename test/testcases/tests/level1/html/{HTMLFrameElement06.xml.kfail => HTMLFrameElement06.xml} (100%) rename test/testcases/tests/level1/html/{HTMLFrameElement07.xml.kfail => HTMLFrameElement07.xml} (100%) rename test/testcases/tests/level1/html/{HTMLFrameElement08.xml.kfail => HTMLFrameElement08.xml} (100%) rename test/testcases/tests/level1/html/{HTMLFrameSetElement01.xml.kfail => HTMLFrameSetElement01.xml} (100%) rename test/testcases/tests/level1/html/{HTMLFrameSetElement02.xml.kfail => HTMLFrameSetElement02.xml} (100%) diff --git a/Makefile b/Makefile index 9b47c36..4dc8af6 100644 --- a/Makefile +++ b/Makefile @@ -131,6 +131,8 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_table_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablerow_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_base_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_style_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frameset_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frame_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 68ae227..d8245ac 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -90,6 +90,8 @@ #include <dom/html/html_tablerow_element.h> #include <dom/html/html_base_element.h> #include <dom/html/html_style_element.h> +#include <dom/html/html_frameset_element.h> +#include <dom/html/html_frame_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_frame_element.h b/include/dom/html/html_frame_element.h index 2e182d5..95d8b48 100644 --- a/include/dom/html/html_frame_element.h +++ b/include/dom/html/html_frame_element.h @@ -3,5 +3,64 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_frame_element_h_ +#define dom_html_frame_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +#include <dom/html/html_document.h> +typedef struct dom_html_frame_element dom_html_frame_element; + +dom_exception dom_html_frame_element_get_frame_border( + dom_html_frame_element *element, dom_string **frame_border); + +dom_exception dom_html_frame_element_set_frame_border( + dom_html_frame_element *element, dom_string *frame_border); + +dom_exception dom_html_frame_element_set_long_desc( + dom_html_frame_element *ele, dom_string *long_desc); + +dom_exception dom_html_frame_element_get_long_desc( + dom_html_frame_element *ele, dom_string **long_desc); + +dom_exception dom_html_frame_element_get_margin_height( + dom_html_frame_element *element, dom_string **margin_height); + +dom_exception dom_html_frame_element_set_margin_height( + dom_html_frame_element *element, dom_string *margin_height); + +dom_exception dom_html_frame_element_get_margin_width( + dom_html_frame_element *element, dom_string **margin_width); + +dom_exception dom_html_frame_element_set_margin_width( + dom_html_frame_element *element, dom_string *margin_width); + +dom_exception dom_html_frame_element_get_name( + dom_html_frame_element *element, dom_string **name); + +dom_exception dom_html_frame_element_set_name( + dom_html_frame_element *element, dom_string *name); + +dom_exception dom_html_frame_element_get_scrolling( + dom_html_frame_element *element, dom_string **scrolling); + +dom_exception dom_html_frame_element_set_scrolling( + dom_html_frame_element *element, dom_string *scrolling); + +dom_exception dom_html_frame_element_get_src( + dom_html_frame_element *element, dom_string **src); + +dom_exception dom_html_frame_element_set_src( + dom_html_frame_element *element, dom_string *src); + +dom_exception dom_html_frame_element_set_no_resize(dom_html_frame_element *ele, + bool no_resize); + +dom_exception dom_html_frame_element_get_no_resize(dom_html_frame_element *ele, + bool *no_resize); + +#endif diff --git a/include/dom/html/html_frameset_element.h b/include/dom/html/html_frameset_element.h index 2e182d5..c0de3b4 100644 --- a/include/dom/html/html_frameset_element.h +++ b/include/dom/html/html_frameset_element.h @@ -3,5 +3,27 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_frame_set_element_h_ +#define dom_html_frame_set_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +typedef struct dom_html_frame_set_element dom_html_frame_set_element; + +dom_exception dom_html_frame_set_element_get_rows( + dom_html_frame_set_element *element, dom_string **rows); + +dom_exception dom_html_frame_set_element_set_rows( + dom_html_frame_set_element *element, dom_string *rows); + +dom_exception dom_html_frame_set_element_set_cols( + dom_html_frame_set_element *ele, dom_string *cols); + +dom_exception dom_html_frame_set_element_get_cols( + dom_html_frame_set_element *ele, dom_string **cols); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 2cb85d9..fa707d4 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -17,10 +17,11 @@ DIR_SOURCES := \ html_param_element.c html_applet_element.c html_area_element.c \ html_map_element.c html_script_element.c html_tablecaption_element.c \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ - html_table_element.c html_tablerow_element.c + html_table_element.c html_tablerow_element.c html_frameset_element.c \ + html_frame_element.c UNINMPLEMENTED_SOURCES := \ - html_frameset_element.c html_isindex_element.c \ - html_frame_element.c html_iframe_element.c + html_isindex_element.c \ + html_iframe_element.c include $(NSBUILD)/Makefile.subdir diff --git a/src/html/html_document.c b/src/html/html_document.c index 0e39f77..a4ba62b 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -57,6 +57,7 @@ #include "html/html_table_element.h" #include "html/html_tablerow_element.h" #include "html/html_style_element.h" +#include "html/html_frameset_element.h" #include "core/attr.h" #include "core/string.h" @@ -365,6 +366,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_STYLE])) { exc = _dom_html_style_element_create(html, (dom_html_style_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_FRAMESET])) { + exc = _dom_html_frame_set_element_create(html, namespace, prefix, + (dom_html_frame_set_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 5d5ddaf..35fca73 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -106,6 +106,9 @@ HTML_DOCUMENT_STRINGS_ACTION1(frame) HTML_DOCUMENT_STRINGS_ACTION1(rules) HTML_DOCUMENT_STRINGS_ACTION1(summary) HTML_DOCUMENT_STRINGS_ACTION1(prompt) +HTML_DOCUMENT_STRINGS_ACTION1(rows) +HTML_DOCUMENT_STRINGS_ACTION1(cols) +HTML_DOCUMENT_STRINGS_ACTION1(scrolling) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) @@ -118,6 +121,9 @@ HTML_DOCUMENT_STRINGS_ACTION(ch,char) HTML_DOCUMENT_STRINGS_ACTION(ch_off,charoff) HTML_DOCUMENT_STRINGS_ACTION(cell_padding,cellpadding) HTML_DOCUMENT_STRINGS_ACTION(cell_spacing,cellspacing) +HTML_DOCUMENT_STRINGS_ACTION(frame_border,frameborder) +HTML_DOCUMENT_STRINGS_ACTION(margin_height,marginheight) +HTML_DOCUMENT_STRINGS_ACTION(margin_width,marginwidth) /* HTML_DOCUMENT_STRINGS_ACTION1(type) */ HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap) /* HTML_DOCUMENT_STRINGS_ACTION1(value) */ diff --git a/src/html/html_frame_element.c b/src/html/html_frame_element.c index 2e182d5..23d9a92 100644 --- a/src/html/html_frame_element.c +++ b/src/html/html_frame_element.c @@ -3,5 +3,278 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> + +#include <dom/html/html_frame_element.h> + +#include "html/html_document.h" +#include "html/html_frame_element.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_FRAME_ELEMENT + }, + DOM_HTML_FRAME_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_frame_element object + * + * \param doc The document object + * \param ele The returned element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_frame_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_frame_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_frame_element object + * + * \param doc The document object + * \param ele The dom_html_frame_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element *ele) +{ + dom_string *scrolling_default = NULL; + dom_exception err; + err = dom_string_create((const uint8_t *) "auto", SLEN("auto"), &scrolling_default); + if (err != DOM_NO_ERR) + return err; + + + dom_string *frame_border_default = NULL; + err = dom_string_create((const uint8_t *) "1", SLEN("1"), &frame_border_default); + if (err != DOM_NO_ERR) + return err; + + err = _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_FRAME], + namespace, prefix); + + ele->scrolling_default = scrolling_default; + ele->frame_border_default = frame_border_default; + + return err; +} + +/** + * Finalise a dom_html_frame_element object + * + * \param ele The dom_html_frame_element object + */ +void _dom_html_frame_element_finalise(struct dom_html_frame_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_frame_element object + * + * \param ele The dom_html_frame_element object + */ +void _dom_html_frame_element_destroy(struct dom_html_frame_element *ele) +{ + _dom_html_frame_element_finalise(ele); + free(ele); +} + +/** + * Get the no_resize property + * + * \param ele The dom_html_frame_element object + * \param no_resize The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_get_no_resize(dom_html_frame_element *ele, + bool *no_resize) +{ + return dom_html_element_get_bool_property(&ele->base, "noresize", + SLEN("noresize"), no_resize); +} + +/** + * Set the no_resize property + * + * \param ele The dom_html_frame_element object + * \param no_resize The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_set_no_resize(dom_html_frame_element *ele, + bool no_resize) +{ + return dom_html_element_set_bool_property(&ele->base, "noresize", + SLEN("noresize"), no_resize); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_frame_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_frame_element_destroy(dom_node_internal *node) +{ + _dom_html_frame_element_destroy((struct dom_html_frame_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_frame_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_frame_element_get_##attr( \ + dom_html_frame_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_frame_element_set_##attr( \ + dom_html_frame_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_GET_SET(long_desc); +SIMPLE_GET_SET(name); +SIMPLE_GET_SET(src); +SIMPLE_SET(frame_border); +SIMPLE_GET_SET(margin_width); +SIMPLE_GET_SET(margin_height); +SIMPLE_SET(scrolling); + + +/** + * Get the frame_border property + * + * \param ele The dom_html_frame_element object + * \param frame_border The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_get_frame_border( + dom_html_frame_element *ele, + dom_string **frame_border) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_frame_border], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_frame_border], frame_border); + } + + *frame_border = ele->frame_border_default; + if (*frame_border != NULL) + dom_string_ref(*frame_border); + return DOM_NO_ERR; +} + +/** + * Get the frame_border property + * + * \param ele The dom_html_frame_element object + * \param scrolling The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_get_scrolling( + dom_html_frame_element *ele, + dom_string **scrolling) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_scrolling], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_scrolling], scrolling); + } + + *scrolling = ele->scrolling_default; + if (*scrolling != NULL) + dom_string_ref(*scrolling); + return DOM_NO_ERR; +} + diff --git a/src/html/html_frame_element.h b/src/html/html_frame_element.h index 2e182d5..77a137b 100644 --- a/src/html/html_frame_element.h +++ b/src/html/html_frame_element.h @@ -3,5 +3,52 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_frame_element_h_ +#define dom_internal_html_frame_element_h_ + +#include <dom/html/html_frameset_element.h> +#include "html/html_element.h" + + +struct dom_html_frame_element { + struct dom_html_element base; + /**< The base class */ + dom_string *scrolling_default; + dom_string *frame_border_default; +}; + +/* Create a dom_html_frame_element object */ +dom_exception _dom_html_frame_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element **ele); + +/* Initialise a dom_html_frame_element object */ +dom_exception _dom_html_frame_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element *ele); + +/* Finalise a dom_html_frame_element object */ +void _dom_html_frame_element_finalise(struct dom_html_frame_element *ele); + +/* Destroy a dom_html_frame_element object */ +void _dom_html_frame_element_destroy(struct dom_html_frame_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_frame_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_frame_element_destroy(dom_node_internal *node); +dom_exception _dom_html_frame_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_FRAME_ELEMENT_PROTECT_VTABLE \ + _dom_html_frame_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_FRAME_ELEMENT \ + _dom_virtual_html_frame_element_destroy, \ + _dom_html_frame_element_copy + +#endif diff --git a/src/html/html_frameset_element.c b/src/html/html_frameset_element.c index 2e182d5..b096156 100644 --- a/src/html/html_frameset_element.c +++ b/src/html/html_frameset_element.c @@ -3,5 +3,234 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> +#include <dom/html/html_frameset_element.h> + +#include "html/html_document.h" +#include "html/html_frameset_element.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_FRAME_SET_ELEMENT + }, + DOM_HTML_FRAME_SET_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_frame_set_element object + * + * \param doc The document object + * \param ele The returned element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_set_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_frame_set_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_frame_set_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_frame_set_element object + * + * \param doc The document object + * \param ele The dom_html_frame_set_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_set_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element *ele) +{ + dom_string *cols_rows_default = NULL; + dom_exception err; + err = dom_string_create((const uint8_t *) "100%", SLEN("100%"), &cols_rows_default); + if (err != DOM_NO_ERR) + return err; + + err = _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_FRAMESET], + namespace, prefix); + ele->cols_rows_default = cols_rows_default; + return err; +} + +/** + * Finalise a dom_html_frame_set_element object + * + * \param ele The dom_html_frame_set_element object + */ +void _dom_html_frame_set_element_finalise(struct dom_html_frame_set_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_frame_set_element object + * + * \param ele The dom_html_frame_set_element object + */ +void _dom_html_frame_set_element_destroy(struct dom_html_frame_set_element *ele) +{ + _dom_html_frame_set_element_finalise(ele); + free(ele); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_frame_set_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_frame_set_element_destroy(dom_node_internal *node) +{ + _dom_html_frame_set_element_destroy((struct dom_html_frame_set_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_frame_set_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_frame_set_element_get_##attr( \ + dom_html_frame_set_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_frame_set_element_set_##attr( \ + dom_html_frame_set_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_SET(rows); +SIMPLE_SET(cols); + +/** + * Get the rows property + * + * \param ele The dom_html_frame_set_element object + * \param rows The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_set_element_get_rows( + dom_html_frame_set_element *ele, + dom_string **rows) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_rows], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_rows], rows); + } + + *rows = ele->cols_rows_default; + if (*rows != NULL) + dom_string_ref(*rows); + + return DOM_NO_ERR; +} + +/** + * Get the cols property + * + * \param ele The dom_html_frame_set_element object + * \param cols The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_set_element_get_cols( + dom_html_frame_set_element *ele, + dom_string **cols) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_cols], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_cols], cols); + } + + *cols = ele->cols_rows_default; + if (*cols != NULL) + dom_string_ref(*cols); + return DOM_NO_ERR; +} diff --git a/src/html/html_frameset_element.h b/src/html/html_frameset_element.h index 2e182d5..fd1c255 100644 --- a/src/html/html_frameset_element.h +++ b/src/html/html_frameset_element.h @@ -3,5 +3,51 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_frame_set_element_h_ +#define dom_internal_html_frame_set_element_h_ + +#include <dom/html/html_frameset_element.h> +#include "html/html_element.h" + + +struct dom_html_frame_set_element { + struct dom_html_element base; + /**< The base class */ + dom_string *cols_rows_default; +}; + +/* Create a dom_html_frame_set_element object */ +dom_exception _dom_html_frame_set_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element **ele); + +/* Initialise a dom_html_frame_set_element object */ +dom_exception _dom_html_frame_set_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element *ele); + +/* Finalise a dom_html_frame_set_element object */ +void _dom_html_frame_set_element_finalise(struct dom_html_frame_set_element *ele); + +/* Destroy a dom_html_frame_set_element object */ +void _dom_html_frame_set_element_destroy(struct dom_html_frame_set_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_frame_set_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_frame_set_element_destroy(dom_node_internal *node); +dom_exception _dom_html_frame_set_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_FRAME_SET_ELEMENT_PROTECT_VTABLE \ + _dom_html_frame_set_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_FRAME_SET_ELEMENT \ + _dom_virtual_html_frame_set_element_destroy, \ + _dom_html_frame_set_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement01.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameElement01.xml diff --git a/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement02.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameElement02.xml diff --git a/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement03.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameElement03.xml diff --git a/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement04.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameElement04.xml diff --git a/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement05.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameElement05.xml diff --git a/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement06.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameElement06.xml diff --git a/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement07.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameElement07.xml diff --git a/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement08.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameElement08.xml diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameSetElement01.xml diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml similarity index 100% rename from test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail rename to test/testcases/tests/level1/html/HTMLFrameSetElement02.xml -- Document Object Model library

8 years, 12 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-265-g1151ae8

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/1151ae8ba2b980d6daf01... ...commit http://git.netsurf-browser.org/netsurf.git/commit/1151ae8ba2b980d6daf019b... ...tree http://git.netsurf-browser.org/netsurf.git/tree/1151ae8ba2b980d6daf019b16... The branch, master has been updated via 1151ae8ba2b980d6daf019b16f92c5e8e5e54555 (commit) from 3834770f11e60407f25b3466c8ac9ec921d46d5d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1151ae8ba2b980d6daf... commit 1151ae8ba2b980d6daf019b16f92c5e8e5e54555 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> Add !Cache to riscos resources diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb new file mode 100644 index 0000000..f126ba2 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb @@ -0,0 +1,3 @@ +Set Cache$FromBoot True +If "<Cache$Dir>" = "" Then Run <Obey$Dir>.!Run +Unset Cache$FromBoot \ No newline at end of file diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Help,feb b/riscos/distribution/!Boot/Resources/!Cache/!Help,feb new file mode 100644 index 0000000..35eeeb3 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/!Help,feb @@ -0,0 +1,2 @@ +If "<CacheAppRes$Path>" = "" Then Run <Cache$AppDir>.Resources.ResFind CacheApp +Filer_Run CacheAppRes:Help \ No newline at end of file diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb new file mode 100644 index 0000000..a920e39 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb @@ -0,0 +1,10 @@ +Set Cache$AppDir <Obey$Dir> +IconSprites <Cache$AppDir>.!Sprites + +Run <Cache$AppDir>.Resources.ResFind CacheApp +Set Cache$Meta CacheAppRes:!Meta + +RMEnsure SysLog 0.17 IfThere <SysLog$Dir>.!Run Then Run <SysLog$Dir>.!Run +RMEnsure SysLog 0.17 Set Cache$SysLogMissing "True" + +Run <Cache$AppDir>.!RunImage \ No newline at end of file diff --git a/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb b/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb new file mode 100644 index 0000000..61752af Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 b/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 new file mode 100644 index 0000000..b71a51c Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 b/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 new file mode 100644 index 0000000..e43f88c Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank b/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank new file mode 100644 index 0000000..898dc58 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank @@ -0,0 +1 @@ +This is here just to stop the directory structure getting lost when unzipping. \ No newline at end of file diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd new file mode 100644 index 0000000..905a788 Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd new file mode 100644 index 0000000..e0d18d5 Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb b/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb new file mode 100644 index 0000000..ec348b0 Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb b/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb new file mode 100644 index 0000000..7766cc9 Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta new file mode 100644 index 0000000..2de40bd --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta @@ -0,0 +1,9 @@ +# Meta file for Cache +Help:<CacheAppRes$Dir>.Help +Version:1.13 +Web:http://www.snowstone.org.uk/riscos/ +Title:Cache +Publisher:Adam Richardson +Description:Cache provides a central location for semi-permanent data on your system. +Email:riscos@snowstone.org.uk + diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help new file mode 100644 index 0000000..aad9bf0 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help @@ -0,0 +1,60 @@ +Cache +----- + +Cache provides a shared location for cached data. This location can be +used by application authors to store semi-permanent data. Cache can be +placed anywhere on your computer where it will be "seen" by the Filer +during start up. (For instance, the "Resources" directory inside !Boot.) + +Once "seen" it will set up a cache location, which can be shown by +double-clicking on !Cache. + + +Application Authors +----------- ------- + +Use Cache in a similar way to using Scrap. You *must not* assume that +Cache is present on the user's system however, as Cache is not an +official part of the system (like Scrap). + +To use Cache you should: + * Check for the presence of "<Cache$Dir>" before proceeding + * Read from and write data to "<Cache$Dir>.APPNAME" where APPNAME has + been allocated to you by the allocations service. See: + http://www.riscosopen.com/content/allocate + * If the APPNAME directory does not exist, you should create it. + +This version of Cache is published by Adam Richardson who can be +contacted at riscos(a)snowstone.org.uk. + +The website for Cache is: http://www.snowstone.org.uk/riscos/ + + +Credits +------- + +Cache is (c) Adam Richardson, 2007. +Thanks to Rob Kendrick for the initial idea and input. + + +License +------- + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages new file mode 100644 index 0000000..3661222 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages @@ -0,0 +1,8 @@ +# Messages for Cache + +multiuser:Multi-user system present. +singleuser:No multi-user system present. +location:Cache directory set to: +opendir:Opening cache location... +fatalerror:Cache has suffered a fatal error and has quit. + diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec new file mode 100644 index 0000000..22f910a Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec differ ----------------------------------------------------------------------- Summary of changes: .../distribution/!Boot/Resources/!Cache/!Boot,feb | 3 + .../distribution/!Boot/Resources/!Cache/!Help,feb | 2 + .../distribution/!Boot/Resources/!Cache/!Run,feb | 10 +++ .../!Boot/Resources/!Cache/!RunImage,ffb | Bin 0 -> 2985 bytes .../!Boot/Resources/!Cache/!Sprites,ff9 | Bin 0 -> 864 bytes .../!Boot/Resources/!Cache/!Sprites22,ff9 | Bin 0 -> 2504 bytes .../!Boot/Resources/!Cache/Caches/Blank | 1 + .../!Cache/Caches/Single/MimeMan/MimeBase,ffd | Bin 0 -> 53248 bytes .../!Cache/Caches/Single/MimeMan/PluginMime,ffd | Bin 0 -> 53248 bytes .../Resources/!Cache/Resources/MultiError,ffb | Bin 0 -> 24031 bytes .../!Boot/Resources/!Cache/Resources/ResFind,ffb | Bin 0 -> 1930 bytes .../!Boot/Resources/!Cache/Resources/UK/!Meta | 9 +++ .../!Boot/Resources/!Cache/Resources/UK/Help | 60 ++++++++++++++++++++ .../!Boot/Resources/!Cache/Resources/UK/Messages | 8 +++ .../Resources/!Cache/Resources/UK/Templates,fec | Bin 0 -> 541 bytes 15 files changed, 93 insertions(+), 0 deletions(-) create mode 100644 riscos/distribution/!Boot/Resources/!Cache/!Boot,feb create mode 100644 riscos/distribution/!Boot/Resources/!Cache/!Help,feb create mode 100644 riscos/distribution/!Boot/Resources/!Cache/!Run,feb create mode 100644 riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb create mode 100644 riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 create mode 100644 riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 create mode 100644 riscos/distribution/!Boot/Resources/!Cache/Caches/Blank create mode 100644 riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd create mode 100644 riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd create mode 100644 riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb create mode 100644 riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb create mode 100644 riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta create mode 100644 riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help create mode 100644 riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages create mode 100644 riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb new file mode 100644 index 0000000..f126ba2 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb @@ -0,0 +1,3 @@ +Set Cache$FromBoot True +If "<Cache$Dir>" = "" Then Run <Obey$Dir>.!Run +Unset Cache$FromBoot \ No newline at end of file diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Help,feb b/riscos/distribution/!Boot/Resources/!Cache/!Help,feb new file mode 100644 index 0000000..35eeeb3 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/!Help,feb @@ -0,0 +1,2 @@ +If "<CacheAppRes$Path>" = "" Then Run <Cache$AppDir>.Resources.ResFind CacheApp +Filer_Run CacheAppRes:Help \ No newline at end of file diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb new file mode 100644 index 0000000..a920e39 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb @@ -0,0 +1,10 @@ +Set Cache$AppDir <Obey$Dir> +IconSprites <Cache$AppDir>.!Sprites + +Run <Cache$AppDir>.Resources.ResFind CacheApp +Set Cache$Meta CacheAppRes:!Meta + +RMEnsure SysLog 0.17 IfThere <SysLog$Dir>.!Run Then Run <SysLog$Dir>.!Run +RMEnsure SysLog 0.17 Set Cache$SysLogMissing "True" + +Run <Cache$AppDir>.!RunImage \ No newline at end of file diff --git a/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb b/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb new file mode 100644 index 0000000..61752af Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 b/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 new file mode 100644 index 0000000..b71a51c Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 b/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 new file mode 100644 index 0000000..e43f88c Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank b/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank new file mode 100644 index 0000000..898dc58 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank @@ -0,0 +1 @@ +This is here just to stop the directory structure getting lost when unzipping. \ No newline at end of file diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd new file mode 100644 index 0000000..905a788 Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd new file mode 100644 index 0000000..e0d18d5 Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb b/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb new file mode 100644 index 0000000..ec348b0 Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb b/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb new file mode 100644 index 0000000..7766cc9 Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb differ diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta new file mode 100644 index 0000000..2de40bd --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta @@ -0,0 +1,9 @@ +# Meta file for Cache +Help:<CacheAppRes$Dir>.Help +Version:1.13 +Web:http://www.snowstone.org.uk/riscos/ +Title:Cache +Publisher:Adam Richardson +Description:Cache provides a central location for semi-permanent data on your system. +Email:riscos@snowstone.org.uk + diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help new file mode 100644 index 0000000..aad9bf0 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help @@ -0,0 +1,60 @@ +Cache +----- + +Cache provides a shared location for cached data. This location can be +used by application authors to store semi-permanent data. Cache can be +placed anywhere on your computer where it will be "seen" by the Filer +during start up. (For instance, the "Resources" directory inside !Boot.) + +Once "seen" it will set up a cache location, which can be shown by +double-clicking on !Cache. + + +Application Authors +----------- ------- + +Use Cache in a similar way to using Scrap. You *must not* assume that +Cache is present on the user's system however, as Cache is not an +official part of the system (like Scrap). + +To use Cache you should: + * Check for the presence of "<Cache$Dir>" before proceeding + * Read from and write data to "<Cache$Dir>.APPNAME" where APPNAME has + been allocated to you by the allocations service. See: + http://www.riscosopen.com/content/allocate + * If the APPNAME directory does not exist, you should create it. + +This version of Cache is published by Adam Richardson who can be +contacted at riscos(a)snowstone.org.uk. + +The website for Cache is: http://www.snowstone.org.uk/riscos/ + + +Credits +------- + +Cache is (c) Adam Richardson, 2007. +Thanks to Rob Kendrick for the initial idea and input. + + +License +------- + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages new file mode 100644 index 0000000..3661222 --- /dev/null +++ b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages @@ -0,0 +1,8 @@ +# Messages for Cache + +multiuser:Multi-user system present. +singleuser:No multi-user system present. +location:Cache directory set to: +opendir:Opening cache location... +fatalerror:Cache has suffered a fatal error and has quit. + diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec new file mode 100644 index 0000000..22f910a Binary files /dev/null and b/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec differ -- NetSurf Browser

8 years, 12 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-264-g3834770

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/3834770f11e60407f25b3... ...commit http://git.netsurf-browser.org/netsurf.git/commit/3834770f11e60407f25b346... ...tree http://git.netsurf-browser.org/netsurf.git/tree/3834770f11e60407f25b3466c... The branch, master has been updated via 3834770f11e60407f25b3466c8ac9ec921d46d5d (commit) from 54fcb66d876420d6a9158ecd70854739f22f159b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3834770f11e60407f25... commit 3834770f11e60407f25b3466c8ac9ec921d46d5d Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> add riscos font header diff --git a/riscos/font.h b/riscos/font.h new file mode 100644 index 0000000..4a1fe4c --- /dev/null +++ b/riscos/font.h @@ -0,0 +1,43 @@ +/* + * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org> + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/** \file riscos/font.h + * RISC OS font interface. + */ + +#ifndef _NETSURF_RISCOS_FONT_H_ +#define _NETSURF_RISCOS_FONT_H_ + +#include <rufl.h> + +/** desktop font, size and style being used */ +extern char ro_gui_desktop_font_family[]; +extern int ro_gui_desktop_font_size; +extern rufl_style ro_gui_desktop_font_style; + +void nsfont_init(void); +bool nsfont_exists(const char *font_family); +const char *nsfont_fallback_font(void); +bool nsfont_paint(const plot_font_style_t *fstyle, const char *string, + size_t length, int x, int y); +void nsfont_read_style(const plot_font_style_t *fstyle, + const char **font_family, unsigned int *font_size, + rufl_style *font_style); +void ro_gui_wimp_get_desktop_font(void); + +#endif ----------------------------------------------------------------------- Summary of changes: framebuffer/fetch.h => riscos/font.h | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) copy framebuffer/fetch.h => riscos/font.h (51%) diff --git a/framebuffer/fetch.h b/riscos/font.h similarity index 51% copy from framebuffer/fetch.h copy to riscos/font.h index 718b083..4a1fe4c 100644 --- a/framebuffer/fetch.h +++ b/riscos/font.h @@ -16,10 +16,28 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +/** \file riscos/font.h + * RISC OS font interface. + */ + +#ifndef _NETSURF_RISCOS_FONT_H_ +#define _NETSURF_RISCOS_FONT_H_ + +#include <rufl.h> -#ifndef NETSURF_FB_FETCH_H -#define NETSURF_FB_FETCH_H +/** desktop font, size and style being used */ +extern char ro_gui_desktop_font_family[]; +extern int ro_gui_desktop_font_size; +extern rufl_style ro_gui_desktop_font_style; -struct gui_fetch_table *framebuffer_fetch_table; +void nsfont_init(void); +bool nsfont_exists(const char *font_family); +const char *nsfont_fallback_font(void); +bool nsfont_paint(const plot_font_style_t *fstyle, const char *string, + size_t length, int x, int y); +void nsfont_read_style(const plot_font_style_t *fstyle, + const char **font_family, unsigned int *font_size, + rufl_style *font_style); +void ro_gui_wimp_get_desktop_font(void); #endif -- NetSurf Browser

8 years, 12 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-263-g54fcb66

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/54fcb66d876420d6a9158... ...commit http://git.netsurf-browser.org/netsurf.git/commit/54fcb66d876420d6a9158ec... ...tree http://git.netsurf-browser.org/netsurf.git/tree/54fcb66d876420d6a9158ecd7... The branch, master has been updated via 54fcb66d876420d6a9158ecd70854739f22f159b (commit) from f1c2dde13bf1ca59a466cfed2f2d2076c06b235f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=54fcb66d876420d6a91... commit 54fcb66d876420d6a9158ecd70854739f22f159b Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> cleanup RISC OS frontend header usage diff --git a/desktop/mouse.h b/desktop/mouse.h index bec221b..083bd17 100644 --- a/desktop/mouse.h +++ b/desktop/mouse.h @@ -78,13 +78,14 @@ typedef enum browser_mouse_state { } browser_mouse_state; -typedef enum { GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET, - GUI_POINTER_MENU, GUI_POINTER_UP, GUI_POINTER_DOWN, - GUI_POINTER_LEFT, GUI_POINTER_RIGHT, GUI_POINTER_RU, - GUI_POINTER_LD, GUI_POINTER_LU, GUI_POINTER_RD, - GUI_POINTER_CROSS, GUI_POINTER_MOVE, GUI_POINTER_WAIT, - GUI_POINTER_HELP, GUI_POINTER_NO_DROP, GUI_POINTER_NOT_ALLOWED, - GUI_POINTER_PROGRESS } gui_pointer_shape; +typedef enum gui_pointer_shape { + GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET, + GUI_POINTER_MENU, GUI_POINTER_UP, GUI_POINTER_DOWN, + GUI_POINTER_LEFT, GUI_POINTER_RIGHT, GUI_POINTER_RU, + GUI_POINTER_LD, GUI_POINTER_LU, GUI_POINTER_RD, + GUI_POINTER_CROSS, GUI_POINTER_MOVE, GUI_POINTER_WAIT, + GUI_POINTER_HELP, GUI_POINTER_NO_DROP, GUI_POINTER_NOT_ALLOWED, + GUI_POINTER_PROGRESS } gui_pointer_shape; /** Mouse pointer type */ typedef enum { diff --git a/riscos/buffer.c b/riscos/buffer.c index c1971f6..a8cb7fd 100644 --- a/riscos/buffer.c +++ b/riscos/buffer.c @@ -19,19 +19,22 @@ #include <stdbool.h> #include <stdlib.h> #include <string.h> -#include "swis.h" -#include "oslib/colourtrans.h" -#include "oslib/os.h" -#include "oslib/osspriteop.h" -#include "oslib/wimp.h" -#include "oslib/wimpreadsysinfo.h" +#include <swis.h> +#include <oslib/colourtrans.h> +#include <oslib/os.h> +#include <oslib/osspriteop.h> +#include <oslib/wimp.h> +#include <oslib/wimpreadsysinfo.h> + +#include "utils/nsoption.h" +#include "utils/log.h" + #include "riscos/buffer.h" #include "riscos/gui.h" -#include "utils/nsoption.h" #include "riscos/tinct.h" #include "riscos/wimp.h" #include "riscos/wimputils.h" -#include "utils/log.h" + #define BUFFER_EXCLUSIVE_USER_REDRAW "Only support pure user redraw (faster)" //#define BUFFER_EMULATE_32BPP "Redirect to a 32bpp sprite and plot with Tinct" diff --git a/riscos/configure.c b/riscos/configure.c index cd831b2..08bcd97 100644 --- a/riscos/configure.c +++ b/riscos/configure.c @@ -25,18 +25,20 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include "oslib/os.h" -#include "oslib/osbyte.h" -#include "oslib/territory.h" -#include "oslib/wimp.h" +#include <oslib/os.h> +#include <oslib/osbyte.h> +#include <oslib/territory.h> +#include <oslib/wimp.h> + +#include "utils/log.h" +#include "utils/utils.h" +#include "utils/messages.h" + #include "riscos/dialog.h" #include "riscos/configure.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure/configure.h" -#include "utils/log.h" -#include "utils/utils.h" -#include "utils/messages.h" #define CONFIGURE_ICON_PADDING_H 32 #define CONFIGURE_ICON_PADDING_V 32 diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index 6261155..c2aa1dc 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -17,18 +17,20 @@ */ #include <stdbool.h> -#include "css/css.h" + #include "utils/nsoption.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "desktop/plot_style.h" +#include "css/css.h" + #include "riscos/dialog.h" -#include "riscos/gui.h" +#include "riscos/font.h" #include "riscos/menus.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" -#include "utils/messages.h" -#include "utils/utils.h" #define FONT_SANS_FIELD 3 diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c index 2af5e3a..30b8242 100644 --- a/riscos/configure/con_inter.c +++ b/riscos/configure/con_inter.c @@ -17,15 +17,16 @@ */ #include <stdbool.h> + +#include "utils/nsoption.h" + #include "riscos/dialog.h" #include "riscos/gui.h" -#include "utils/nsoption.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" - #define INTERFACE_STRIP_EXTNS_OPTION 2 #define INTERFACE_CONFIRM_OVWR_OPTION 3 #define INTERFACE_URL_COMPLETE_OPTION 6 diff --git a/riscos/dialog.c b/riscos/dialog.c index 91d5c29..1c95a70 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -22,19 +22,27 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "utils/config.h" + #include <assert.h> #include <stddef.h> #include <stdlib.h> #include <string.h> -#include "oslib/colourtrans.h" -#include "oslib/osfile.h" -#include "oslib/osgbpb.h" -#include "oslib/osspriteop.h" -#include "oslib/wimp.h" -#include "rufl.h" -#include "utils/config.h" +#include <oslib/colourtrans.h> +#include <oslib/osfile.h> +#include <oslib/osgbpb.h> +#include <oslib/osspriteop.h> +#include <oslib/wimp.h> + +#include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" #include "desktop/netsurf.h" +#include "desktop/browser.h" #include "render/font.h" + #include "riscos/configure.h" #include "riscos/cookies.h" #include "riscos/dialog.h" @@ -42,7 +50,6 @@ #include "riscos/gui.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/sslcert.h" #include "riscos/toolbar.h" @@ -51,10 +58,6 @@ #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/url.h" -#include "utils/utils.h" #define ICON_ZOOM_VALUE 1 #define ICON_ZOOM_DEC 2 diff --git a/riscos/filetype.h b/riscos/filetype.h index 115c1ef..20dfb6c 100644 --- a/riscos/filetype.h +++ b/riscos/filetype.h @@ -23,6 +23,8 @@ #ifndef _NETSURF_RISCOS_FILETYPE_H_ #define _NETSURF_RISCOS_FILETYPE_H_ +#include "content/content_type.h" + #ifndef FILETYPE_ACORN_URI #define FILETYPE_ACORN_URI 0xf91 #endif diff --git a/riscos/font.c b/riscos/font.c index ddbe853..7e6c80f 100644 --- a/riscos/font.c +++ b/riscos/font.c @@ -17,25 +17,29 @@ */ /** \file - * Font handling (RISC OS implementation). + * RISC OS implementation of Font handling. * - * The RUfl is used handle and render fonts. + * The RUfl is used to handle and render fonts. */ +#include "utils/config.h" + #include <assert.h> #include <string.h> -#include "oslib/wimp.h" -#include "oslib/wimpreadsysinfo.h" -#include "rufl.h" +#include <oslib/wimp.h> +#include <oslib/wimpreadsysinfo.h> + #include "css/css.h" #include "css/utils.h" #include "render/font.h" -#include "riscos/gui.h" #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" +#include "riscos/gui.h" +#include "riscos/font.h" + static void nsfont_check_option(char **option, const char *family, const char *fallback); static int nsfont_list_cmp(const void *keyval, const void *datum); diff --git a/riscos/gui.c b/riscos/gui.c index 4c04c72..35d3cb6 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -51,6 +51,7 @@ #include "desktop/save_complete.h" #include "desktop/treeview.h" #include "desktop/netsurf.h" +#include "desktop/browser.h" #include "content/urldb.h" #include "content/hlcache.h" #include "content/backing_store.h" @@ -78,6 +79,7 @@ #include "riscos/mouse.h" #include "riscos/ucstables.h" #include "riscos/filetype.h" +#include "riscos/font.h" #include "riscos/content-handlers/artworks.h" #include "riscos/content-handlers/draw.h" #include "riscos/content-handlers/sprite.h" diff --git a/riscos/gui.h b/riscos/gui.h index 1dcc1e1..bc59b5d 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -21,15 +21,7 @@ #ifndef _NETSURF_RISCOS_GUI_H_ #define _NETSURF_RISCOS_GUI_H_ -#include <stdbool.h> -#include <stdlib.h> -#include <oslib/osspriteop.h> #include <oslib/wimp.h> -#include <rufl.h> - -#include "desktop/browser.h" -#include "content/content_type.h" -#include "utils/config.h" #define RISCOS5 0xAA @@ -53,6 +45,10 @@ struct node; struct history; struct css_style; struct ssl_cert_info; +struct nsurl; +struct hlcache_handle; + +enum gui_pointer_shape; extern wimp_t task_handle; /**< RISC OS wimp task handle. */ @@ -76,12 +72,6 @@ typedef enum { GUI_DRAG_NONE, GUI_DRAG_DOWNLOAD_SAVE, GUI_DRAG_SAVE } extern ro_gui_drag_type gui_current_drag_type; -/** desktop font, size and style being used */ -extern char ro_gui_desktop_font_family[]; -extern int ro_gui_desktop_font_size; -extern rufl_style ro_gui_desktop_font_style; - - /** RISC OS data for a browser window. */ struct gui_window { /** Associated platform-independent browser window data. */ @@ -133,7 +123,7 @@ extern struct gui_download_table *riscos_download_table; /* in 401login.c */ void ro_gui_401login_init(void); -void gui_401login_open(nsurl *url, const char *realm, +void gui_401login_open(struct nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw); /* in window.c */ @@ -156,14 +146,14 @@ bool ro_gui_window_to_window_pos(struct gui_window *g, int x, int y, os_coord *pos); bool ro_gui_window_to_screen_pos(struct gui_window *g, int x, int y, os_coord *pos); -browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons, +enum browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons, wimp_icon_flags type); -browser_mouse_state ro_gui_mouse_drag_state(wimp_mouse_state buttons, +enum browser_mouse_state ro_gui_mouse_drag_state(wimp_mouse_state buttons, wimp_icon_flags type); bool ro_gui_shift_pressed(void); bool ro_gui_ctrl_pressed(void); bool ro_gui_alt_pressed(void); -void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape); +void gui_window_set_pointer(struct gui_window *g, enum gui_pointer_shape shape); void gui_create_form_select_menu(struct browser_window *bw, struct form_control *control); /* in history.c */ @@ -200,17 +190,6 @@ struct gui_search_table *riscos_search_table; void ro_gui_print_init(void); void ro_gui_print_prepare(struct gui_window *g); -/* in font.c */ -void nsfont_init(void); -bool nsfont_exists(const char *font_family); -const char *nsfont_fallback_font(void); -bool nsfont_paint(const plot_font_style_t *fstyle, const char *string, - size_t length, int x, int y); -void nsfont_read_style(const plot_font_style_t *fstyle, - const char **font_family, unsigned int *font_size, - rufl_style *font_style); -void ro_gui_wimp_get_desktop_font(void); - /* in plotters.c */ extern const struct plotter_table ro_plotters; extern int ro_plot_origin_x; @@ -220,7 +199,7 @@ extern int ro_plot_origin_y; bool ro_gui_theme_install_apply(wimp_w w); /* in sslcert.c */ -void gui_cert_verify(nsurl *url, +void gui_cert_verify(struct nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw); diff --git a/riscos/gui/button_bar.c b/riscos/gui/button_bar.c index 8602787..d92433d 100644 --- a/riscos/gui/button_bar.c +++ b/riscos/gui/button_bar.c @@ -26,18 +26,20 @@ #include <stdbool.h> #include <stdlib.h> #include <string.h> -#include "oslib/dragasprite.h" -#include "oslib/os.h" -#include "oslib/osspriteop.h" -#include "oslib/wimp.h" -#include "oslib/wimpspriteop.h" +#include <oslib/dragasprite.h> +#include <oslib/os.h> +#include <oslib/osspriteop.h> +#include <oslib/wimp.h> +#include <oslib/wimpspriteop.h> + +#include "utils/log.h" +#include "utils/utils.h" + #include "riscos/gui/button_bar.h" #include "riscos/gui.h" #include "riscos/mouse.h" #include "riscos/theme.h" #include "riscos/wimp.h" -#include "utils/log.h" -#include "utils/utils.h" #define BUTTONBAR_SPRITE_NAME_LENGTH 12 #define BUTTONBAR_VALIDATION_LENGTH 40 diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c index 8c45fd2..57a32ae 100644 --- a/riscos/gui/status_bar.c +++ b/riscos/gui/status_bar.c @@ -31,10 +31,12 @@ #include "desktop/plotters.h" #include "utils/log.h" #include "utils/utils.h" + #include "riscos/gui.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" +#include "riscos/font.h" #include "riscos/gui/progress_bar.h" #include "riscos/gui/status_bar.h" diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index c55fa61..d890048 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -37,6 +37,7 @@ #include "utils/utils.h" #include "content/hlcache.h" #include "content/content.h" +#include "desktop/browser.h" #include "riscos/gui.h" #include "riscos/hotlist.h" diff --git a/riscos/help.c b/riscos/help.c index 80153a6..5c8c9c7 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -20,33 +20,26 @@ * Interactive help (implementation). */ -#include <assert.h> -#include <stdbool.h> -#include <stdio.h> -#include "oslib/help.h" -#include "oslib/os.h" -#include "oslib/taskmanager.h" -#include "oslib/wimp.h" -#include "desktop/tree.h" -#include "riscos/cookies.h" -#include "riscos/global_history.h" -#include "riscos/gui.h" -#include "riscos/hotlist.h" -#include "riscos/help.h" -#include "riscos/iconbar.h" -#include "riscos/menus.h" +#include <oslib/wimp.h> +#include <oslib/taskmanager.h> + #include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/utils.h" +#include "utils/messages.h" +#include "utils/utf8.h" + #include "riscos/treeview.h" -#include "riscos/wimp.h" +#include "riscos/help.h" #include "riscos/wimp_event.h" +#include "riscos/hotlist.h" +#include "riscos/global_history.h" +#include "riscos/cookies.h" +#include "riscos/wimp.h" +#include "riscos/iconbar.h" #include "riscos/window.h" -#include "utils/messages.h" -#include "utils/log.h" -#include "utils/utf8.h" -#include "utils/utils.h" #include "riscos/ucstables.h" - /* Recognised help keys ==================== Help keys should be registered using the wimp_event system to be diff --git a/riscos/hotlist.h b/riscos/hotlist.h index 5477cce..0b87a2e 100644 --- a/riscos/hotlist.h +++ b/riscos/hotlist.h @@ -36,6 +36,8 @@ #include "riscos/menus.h" +struct nsurl; + void ro_gui_hotlist_preinitialise(void); void ro_gui_hotlist_postinitialise(void); void ro_gui_hotlist_destroy(void); @@ -43,9 +45,9 @@ void ro_gui_hotlist_open(void); void ro_gui_hotlist_save(void); bool ro_gui_hotlist_check_window(wimp_w window); bool ro_gui_hotlist_check_menu(wimp_menu *menu); -void ro_gui_hotlist_add_page(nsurl *url); +void ro_gui_hotlist_add_page(struct nsurl *url); void ro_gui_hotlist_add_cleanup(void); -void ro_gui_hotlist_remove_page(nsurl *url); -bool ro_gui_hotlist_has_page(nsurl *url); +void ro_gui_hotlist_remove_page(struct nsurl *url); +bool ro_gui_hotlist_has_page(struct nsurl *url); #endif diff --git a/riscos/iconbar.c b/riscos/iconbar.c index e0949b3..bcc20d0 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -28,23 +28,24 @@ #include <string.h> #include <time.h> #include <features.h> +#include <oslib/os.h> +#include <oslib/osbyte.h> +#include <oslib/wimp.h> + +#include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "desktop/netsurf.h" +#include "desktop/browser.h" -#include "oslib/os.h" -#include "oslib/osbyte.h" -#include "oslib/wimp.h" #include "riscos/configure.h" #include "riscos/cookies.h" #include "riscos/dialog.h" #include "riscos/global_history.h" #include "riscos/hotlist.h" #include "riscos/iconbar.h" -#include "desktop/netsurf.h" -#include "desktop/browser.h" -#include "utils/nsoption.h" #include "riscos/wimp_event.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" static bool ro_gui_iconbar_click(wimp_pointer *pointer); diff --git a/riscos/image.c b/riscos/image.c index 56feb2b..07baecd 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -17,16 +17,17 @@ */ #include <stdbool.h> -#include "swis.h" -#include "oslib/colourtrans.h" -#include "oslib/osspriteop.h" -#include "riscos/image.h" -#include "riscos/gui.h" +#include <swis.h> +#include <oslib/colourtrans.h> +#include <oslib/osspriteop.h> + #include "utils/nsoption.h" -#include "riscos/tinct.h" #include "utils/log.h" #include "utils/utils.h" +#include "riscos/image.h" +#include "riscos/gui.h" +#include "riscos/tinct.h" static bool image_redraw_tinct(osspriteop_id header, int x, int y, int req_width, int req_height, int width, int height, diff --git a/riscos/plotters.c b/riscos/plotters.c index 0ab39d0..6e49c22 100644 --- a/riscos/plotters.c +++ b/riscos/plotters.c @@ -25,13 +25,16 @@ #include "oslib/colourtrans.h" #include "oslib/draw.h" #include "oslib/os.h" + +#include "utils/log.h" #include "desktop/plotters.h" #include "render/font.h" + #include "riscos/bitmap.h" #include "riscos/image.h" #include "riscos/gui.h" +#include "riscos/font.h" #include "riscos/oslib_pre7.h" -#include "utils/log.h" static bool ro_plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style); diff --git a/riscos/print.c b/riscos/print.c index 16e657b..360ff15 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -21,29 +21,32 @@ #include <assert.h> #include <string.h> -#include "swis.h" -#include "oslib/font.h" -#include "oslib/hourglass.h" -#include "oslib/osfile.h" -#include "oslib/osfind.h" -#include "oslib/pdriver.h" -#include "oslib/wimp.h" -#include "rufl.h" +#include <swis.h> +#include <oslib/font.h> +#include <oslib/hourglass.h> +#include <oslib/osfile.h> +#include <oslib/osfind.h> +#include <oslib/pdriver.h> +#include <oslib/wimp.h> +#include <rufl.h> + #include "utils/config.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/nsoption.h" #include "content/content.h" #include "content/hlcache.h" #include "desktop/browser_private.h" -#include "utils/nsoption.h" #include "desktop/plotters.h" + #include "riscos/dialog.h" #include "riscos/menus.h" #include "riscos/print.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #include "riscos/filetype.h" +#include "riscos/font.h" #define ICON_PRINT_TO_BOTTOM 1 diff --git a/riscos/query.c b/riscos/query.c index 2be2e2a..6f3fca2 100644 --- a/riscos/query.c +++ b/riscos/query.c @@ -18,17 +18,17 @@ #include <stdlib.h> #include <string.h> - #include <stdbool.h> -#include "riscos/dialog.h" -#include "riscos/query.h" -#include "riscos/wimp.h" -#include "riscos/wimp_event.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utf8.h" #include "utils/utils.h" + +#include "riscos/dialog.h" +#include "riscos/query.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" #include "riscos/ucstables.h" #define ICON_QUERY_MESSAGE 0 diff --git a/riscos/save_draw.c b/riscos/save_draw.c index e082332..e8b7faa 100644 --- a/riscos/save_draw.c +++ b/riscos/save_draw.c @@ -26,18 +26,21 @@ #include <assert.h> #include <limits.h> -#include "oslib/draw.h" -#include "oslib/osfile.h" -#include "pencil.h" +#include <oslib/draw.h> +#include <oslib/osfile.h> +#include <pencil.h> + +#include "utils/log.h" +#include "utils/types.h" +#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "desktop/plotters.h" + #include "riscos/bitmap.h" #include "riscos/gui.h" #include "riscos/save_draw.h" -#include "utils/log.h" -#include "utils/types.h" -#include "utils/utils.h" +#include "riscos/font.h" static bool ro_save_draw_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style); static bool ro_save_draw_line(int x0, int y0, int x1, int y1, const plot_style_t *style); diff --git a/riscos/textarea.c b/riscos/textarea.c index 85c9ca3..303b7e7 100644 --- a/riscos/textarea.c +++ b/riscos/textarea.c @@ -24,13 +24,17 @@ #include <stdbool.h> #include <stdint.h> #include <string.h> -#include "swis.h" -#include "oslib/colourtrans.h" -#include "oslib/osbyte.h" -#include "oslib/serviceinternational.h" -#include "oslib/wimp.h" -#include "oslib/wimpspriteop.h" -#include "rufl.h" +#include <swis.h> +#include <oslib/colourtrans.h> +#include <oslib/osbyte.h> +#include <oslib/serviceinternational.h> +#include <oslib/wimp.h> +#include <oslib/wimpspriteop.h> + +#include "utils/log.h" +#include "utils/utf8.h" +#include "desktop/browser.h" + #include "riscos/gui.h" #include "riscos/oslib_pre7.h" #include "riscos/textarea.h" @@ -38,8 +42,6 @@ #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/utf8.h" #define MARGIN_LEFT 8 #define MARGIN_RIGHT 8 diff --git a/riscos/textselection.c b/riscos/textselection.c index 2c85204..f002e07 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -32,6 +32,7 @@ #include "content/hlcache.h" #include "desktop/gui.h" #include "desktop/textinput.h" +#include "desktop/browser.h" #include "riscos/gui.h" #include "riscos/menus.h" diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 5f45cd5..6881de7 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -25,19 +25,22 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "oslib/wimp.h" -#include "content/urldb.h" +#include <oslib/wimp.h> + #include "utils/log.h" +#include "utils/nsoption.h" +#include "utils/utils.h" +#include "content/urldb.h" +#include "desktop/browser.h" + #include "riscos/global_history.h" #include "riscos/gui.h" #include "riscos/mouse.h" -#include "utils/nsoption.h" #include "riscos/toolbar.h" #include "riscos/url_complete.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/utils.h" #include "riscos/filetype.h" #define MAXIMUM_VISIBLE_LINES 7 ----------------------------------------------------------------------- Summary of changes: desktop/mouse.h | 15 ++++++++------- riscos/buffer.c | 19 +++++++++++-------- riscos/configure.c | 16 +++++++++------- riscos/configure/con_fonts.c | 10 ++++++---- riscos/configure/con_inter.c | 5 +++-- riscos/dialog.c | 27 +++++++++++++++------------ riscos/filetype.h | 2 ++ riscos/font.c | 16 ++++++++++------ riscos/gui.c | 2 ++ riscos/gui.h | 39 +++++++++------------------------------ riscos/gui/button_bar.c | 16 +++++++++------- riscos/gui/status_bar.c | 2 ++ riscos/gui/url_bar.c | 1 + riscos/help.c | 35 ++++++++++++++--------------------- riscos/hotlist.h | 8 +++++--- riscos/iconbar.c | 19 ++++++++++--------- riscos/image.c | 13 +++++++------ riscos/plotters.c | 5 ++++- riscos/print.c | 27 +++++++++++++++------------ riscos/query.c | 10 +++++----- riscos/save_draw.c | 15 +++++++++------ riscos/textarea.c | 20 +++++++++++--------- riscos/textselection.c | 1 + riscos/url_complete.c | 11 +++++++---- 24 files changed, 175 insertions(+), 159 deletions(-) diff --git a/desktop/mouse.h b/desktop/mouse.h index bec221b..083bd17 100644 --- a/desktop/mouse.h +++ b/desktop/mouse.h @@ -78,13 +78,14 @@ typedef enum browser_mouse_state { } browser_mouse_state; -typedef enum { GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET, - GUI_POINTER_MENU, GUI_POINTER_UP, GUI_POINTER_DOWN, - GUI_POINTER_LEFT, GUI_POINTER_RIGHT, GUI_POINTER_RU, - GUI_POINTER_LD, GUI_POINTER_LU, GUI_POINTER_RD, - GUI_POINTER_CROSS, GUI_POINTER_MOVE, GUI_POINTER_WAIT, - GUI_POINTER_HELP, GUI_POINTER_NO_DROP, GUI_POINTER_NOT_ALLOWED, - GUI_POINTER_PROGRESS } gui_pointer_shape; +typedef enum gui_pointer_shape { + GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET, + GUI_POINTER_MENU, GUI_POINTER_UP, GUI_POINTER_DOWN, + GUI_POINTER_LEFT, GUI_POINTER_RIGHT, GUI_POINTER_RU, + GUI_POINTER_LD, GUI_POINTER_LU, GUI_POINTER_RD, + GUI_POINTER_CROSS, GUI_POINTER_MOVE, GUI_POINTER_WAIT, + GUI_POINTER_HELP, GUI_POINTER_NO_DROP, GUI_POINTER_NOT_ALLOWED, + GUI_POINTER_PROGRESS } gui_pointer_shape; /** Mouse pointer type */ typedef enum { diff --git a/riscos/buffer.c b/riscos/buffer.c index c1971f6..a8cb7fd 100644 --- a/riscos/buffer.c +++ b/riscos/buffer.c @@ -19,19 +19,22 @@ #include <stdbool.h> #include <stdlib.h> #include <string.h> -#include "swis.h" -#include "oslib/colourtrans.h" -#include "oslib/os.h" -#include "oslib/osspriteop.h" -#include "oslib/wimp.h" -#include "oslib/wimpreadsysinfo.h" +#include <swis.h> +#include <oslib/colourtrans.h> +#include <oslib/os.h> +#include <oslib/osspriteop.h> +#include <oslib/wimp.h> +#include <oslib/wimpreadsysinfo.h> + +#include "utils/nsoption.h" +#include "utils/log.h" + #include "riscos/buffer.h" #include "riscos/gui.h" -#include "utils/nsoption.h" #include "riscos/tinct.h" #include "riscos/wimp.h" #include "riscos/wimputils.h" -#include "utils/log.h" + #define BUFFER_EXCLUSIVE_USER_REDRAW "Only support pure user redraw (faster)" //#define BUFFER_EMULATE_32BPP "Redirect to a 32bpp sprite and plot with Tinct" diff --git a/riscos/configure.c b/riscos/configure.c index cd831b2..08bcd97 100644 --- a/riscos/configure.c +++ b/riscos/configure.c @@ -25,18 +25,20 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include "oslib/os.h" -#include "oslib/osbyte.h" -#include "oslib/territory.h" -#include "oslib/wimp.h" +#include <oslib/os.h> +#include <oslib/osbyte.h> +#include <oslib/territory.h> +#include <oslib/wimp.h> + +#include "utils/log.h" +#include "utils/utils.h" +#include "utils/messages.h" + #include "riscos/dialog.h" #include "riscos/configure.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure/configure.h" -#include "utils/log.h" -#include "utils/utils.h" -#include "utils/messages.h" #define CONFIGURE_ICON_PADDING_H 32 #define CONFIGURE_ICON_PADDING_V 32 diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c index 6261155..c2aa1dc 100644 --- a/riscos/configure/con_fonts.c +++ b/riscos/configure/con_fonts.c @@ -17,18 +17,20 @@ */ #include <stdbool.h> -#include "css/css.h" + #include "utils/nsoption.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "desktop/plot_style.h" +#include "css/css.h" + #include "riscos/dialog.h" -#include "riscos/gui.h" +#include "riscos/font.h" #include "riscos/menus.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" -#include "utils/messages.h" -#include "utils/utils.h" #define FONT_SANS_FIELD 3 diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c index 2af5e3a..30b8242 100644 --- a/riscos/configure/con_inter.c +++ b/riscos/configure/con_inter.c @@ -17,15 +17,16 @@ */ #include <stdbool.h> + +#include "utils/nsoption.h" + #include "riscos/dialog.h" #include "riscos/gui.h" -#include "utils/nsoption.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" - #define INTERFACE_STRIP_EXTNS_OPTION 2 #define INTERFACE_CONFIRM_OVWR_OPTION 3 #define INTERFACE_URL_COMPLETE_OPTION 6 diff --git a/riscos/dialog.c b/riscos/dialog.c index 91d5c29..1c95a70 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -22,19 +22,27 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "utils/config.h" + #include <assert.h> #include <stddef.h> #include <stdlib.h> #include <string.h> -#include "oslib/colourtrans.h" -#include "oslib/osfile.h" -#include "oslib/osgbpb.h" -#include "oslib/osspriteop.h" -#include "oslib/wimp.h" -#include "rufl.h" -#include "utils/config.h" +#include <oslib/colourtrans.h> +#include <oslib/osfile.h> +#include <oslib/osgbpb.h> +#include <oslib/osspriteop.h> +#include <oslib/wimp.h> + +#include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" #include "desktop/netsurf.h" +#include "desktop/browser.h" #include "render/font.h" + #include "riscos/configure.h" #include "riscos/cookies.h" #include "riscos/dialog.h" @@ -42,7 +50,6 @@ #include "riscos/gui.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/sslcert.h" #include "riscos/toolbar.h" @@ -51,10 +58,6 @@ #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/url.h" -#include "utils/utils.h" #define ICON_ZOOM_VALUE 1 #define ICON_ZOOM_DEC 2 diff --git a/riscos/filetype.h b/riscos/filetype.h index 115c1ef..20dfb6c 100644 --- a/riscos/filetype.h +++ b/riscos/filetype.h @@ -23,6 +23,8 @@ #ifndef _NETSURF_RISCOS_FILETYPE_H_ #define _NETSURF_RISCOS_FILETYPE_H_ +#include "content/content_type.h" + #ifndef FILETYPE_ACORN_URI #define FILETYPE_ACORN_URI 0xf91 #endif diff --git a/riscos/font.c b/riscos/font.c index ddbe853..7e6c80f 100644 --- a/riscos/font.c +++ b/riscos/font.c @@ -17,25 +17,29 @@ */ /** \file - * Font handling (RISC OS implementation). + * RISC OS implementation of Font handling. * - * The RUfl is used handle and render fonts. + * The RUfl is used to handle and render fonts. */ +#include "utils/config.h" + #include <assert.h> #include <string.h> -#include "oslib/wimp.h" -#include "oslib/wimpreadsysinfo.h" -#include "rufl.h" +#include <oslib/wimp.h> +#include <oslib/wimpreadsysinfo.h> + #include "css/css.h" #include "css/utils.h" #include "render/font.h" -#include "riscos/gui.h" #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" +#include "riscos/gui.h" +#include "riscos/font.h" + static void nsfont_check_option(char **option, const char *family, const char *fallback); static int nsfont_list_cmp(const void *keyval, const void *datum); diff --git a/riscos/gui.c b/riscos/gui.c index 4c04c72..35d3cb6 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -51,6 +51,7 @@ #include "desktop/save_complete.h" #include "desktop/treeview.h" #include "desktop/netsurf.h" +#include "desktop/browser.h" #include "content/urldb.h" #include "content/hlcache.h" #include "content/backing_store.h" @@ -78,6 +79,7 @@ #include "riscos/mouse.h" #include "riscos/ucstables.h" #include "riscos/filetype.h" +#include "riscos/font.h" #include "riscos/content-handlers/artworks.h" #include "riscos/content-handlers/draw.h" #include "riscos/content-handlers/sprite.h" diff --git a/riscos/gui.h b/riscos/gui.h index 1dcc1e1..bc59b5d 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -21,15 +21,7 @@ #ifndef _NETSURF_RISCOS_GUI_H_ #define _NETSURF_RISCOS_GUI_H_ -#include <stdbool.h> -#include <stdlib.h> -#include <oslib/osspriteop.h> #include <oslib/wimp.h> -#include <rufl.h> - -#include "desktop/browser.h" -#include "content/content_type.h" -#include "utils/config.h" #define RISCOS5 0xAA @@ -53,6 +45,10 @@ struct node; struct history; struct css_style; struct ssl_cert_info; +struct nsurl; +struct hlcache_handle; + +enum gui_pointer_shape; extern wimp_t task_handle; /**< RISC OS wimp task handle. */ @@ -76,12 +72,6 @@ typedef enum { GUI_DRAG_NONE, GUI_DRAG_DOWNLOAD_SAVE, GUI_DRAG_SAVE } extern ro_gui_drag_type gui_current_drag_type; -/** desktop font, size and style being used */ -extern char ro_gui_desktop_font_family[]; -extern int ro_gui_desktop_font_size; -extern rufl_style ro_gui_desktop_font_style; - - /** RISC OS data for a browser window. */ struct gui_window { /** Associated platform-independent browser window data. */ @@ -133,7 +123,7 @@ extern struct gui_download_table *riscos_download_table; /* in 401login.c */ void ro_gui_401login_init(void); -void gui_401login_open(nsurl *url, const char *realm, +void gui_401login_open(struct nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw); /* in window.c */ @@ -156,14 +146,14 @@ bool ro_gui_window_to_window_pos(struct gui_window *g, int x, int y, os_coord *pos); bool ro_gui_window_to_screen_pos(struct gui_window *g, int x, int y, os_coord *pos); -browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons, +enum browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons, wimp_icon_flags type); -browser_mouse_state ro_gui_mouse_drag_state(wimp_mouse_state buttons, +enum browser_mouse_state ro_gui_mouse_drag_state(wimp_mouse_state buttons, wimp_icon_flags type); bool ro_gui_shift_pressed(void); bool ro_gui_ctrl_pressed(void); bool ro_gui_alt_pressed(void); -void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape); +void gui_window_set_pointer(struct gui_window *g, enum gui_pointer_shape shape); void gui_create_form_select_menu(struct browser_window *bw, struct form_control *control); /* in history.c */ @@ -200,17 +190,6 @@ struct gui_search_table *riscos_search_table; void ro_gui_print_init(void); void ro_gui_print_prepare(struct gui_window *g); -/* in font.c */ -void nsfont_init(void); -bool nsfont_exists(const char *font_family); -const char *nsfont_fallback_font(void); -bool nsfont_paint(const plot_font_style_t *fstyle, const char *string, - size_t length, int x, int y); -void nsfont_read_style(const plot_font_style_t *fstyle, - const char **font_family, unsigned int *font_size, - rufl_style *font_style); -void ro_gui_wimp_get_desktop_font(void); - /* in plotters.c */ extern const struct plotter_table ro_plotters; extern int ro_plot_origin_x; @@ -220,7 +199,7 @@ extern int ro_plot_origin_y; bool ro_gui_theme_install_apply(wimp_w w); /* in sslcert.c */ -void gui_cert_verify(nsurl *url, +void gui_cert_verify(struct nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw); diff --git a/riscos/gui/button_bar.c b/riscos/gui/button_bar.c index 8602787..d92433d 100644 --- a/riscos/gui/button_bar.c +++ b/riscos/gui/button_bar.c @@ -26,18 +26,20 @@ #include <stdbool.h> #include <stdlib.h> #include <string.h> -#include "oslib/dragasprite.h" -#include "oslib/os.h" -#include "oslib/osspriteop.h" -#include "oslib/wimp.h" -#include "oslib/wimpspriteop.h" +#include <oslib/dragasprite.h> +#include <oslib/os.h> +#include <oslib/osspriteop.h> +#include <oslib/wimp.h> +#include <oslib/wimpspriteop.h> + +#include "utils/log.h" +#include "utils/utils.h" + #include "riscos/gui/button_bar.h" #include "riscos/gui.h" #include "riscos/mouse.h" #include "riscos/theme.h" #include "riscos/wimp.h" -#include "utils/log.h" -#include "utils/utils.h" #define BUTTONBAR_SPRITE_NAME_LENGTH 12 #define BUTTONBAR_VALIDATION_LENGTH 40 diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c index 8c45fd2..57a32ae 100644 --- a/riscos/gui/status_bar.c +++ b/riscos/gui/status_bar.c @@ -31,10 +31,12 @@ #include "desktop/plotters.h" #include "utils/log.h" #include "utils/utils.h" + #include "riscos/gui.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" +#include "riscos/font.h" #include "riscos/gui/progress_bar.h" #include "riscos/gui/status_bar.h" diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index c55fa61..d890048 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -37,6 +37,7 @@ #include "utils/utils.h" #include "content/hlcache.h" #include "content/content.h" +#include "desktop/browser.h" #include "riscos/gui.h" #include "riscos/hotlist.h" diff --git a/riscos/help.c b/riscos/help.c index 80153a6..5c8c9c7 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -20,33 +20,26 @@ * Interactive help (implementation). */ -#include <assert.h> -#include <stdbool.h> -#include <stdio.h> -#include "oslib/help.h" -#include "oslib/os.h" -#include "oslib/taskmanager.h" -#include "oslib/wimp.h" -#include "desktop/tree.h" -#include "riscos/cookies.h" -#include "riscos/global_history.h" -#include "riscos/gui.h" -#include "riscos/hotlist.h" -#include "riscos/help.h" -#include "riscos/iconbar.h" -#include "riscos/menus.h" +#include <oslib/wimp.h> +#include <oslib/taskmanager.h> + #include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/utils.h" +#include "utils/messages.h" +#include "utils/utf8.h" + #include "riscos/treeview.h" -#include "riscos/wimp.h" +#include "riscos/help.h" #include "riscos/wimp_event.h" +#include "riscos/hotlist.h" +#include "riscos/global_history.h" +#include "riscos/cookies.h" +#include "riscos/wimp.h" +#include "riscos/iconbar.h" #include "riscos/window.h" -#include "utils/messages.h" -#include "utils/log.h" -#include "utils/utf8.h" -#include "utils/utils.h" #include "riscos/ucstables.h" - /* Recognised help keys ==================== Help keys should be registered using the wimp_event system to be diff --git a/riscos/hotlist.h b/riscos/hotlist.h index 5477cce..0b87a2e 100644 --- a/riscos/hotlist.h +++ b/riscos/hotlist.h @@ -36,6 +36,8 @@ #include "riscos/menus.h" +struct nsurl; + void ro_gui_hotlist_preinitialise(void); void ro_gui_hotlist_postinitialise(void); void ro_gui_hotlist_destroy(void); @@ -43,9 +45,9 @@ void ro_gui_hotlist_open(void); void ro_gui_hotlist_save(void); bool ro_gui_hotlist_check_window(wimp_w window); bool ro_gui_hotlist_check_menu(wimp_menu *menu); -void ro_gui_hotlist_add_page(nsurl *url); +void ro_gui_hotlist_add_page(struct nsurl *url); void ro_gui_hotlist_add_cleanup(void); -void ro_gui_hotlist_remove_page(nsurl *url); -bool ro_gui_hotlist_has_page(nsurl *url); +void ro_gui_hotlist_remove_page(struct nsurl *url); +bool ro_gui_hotlist_has_page(struct nsurl *url); #endif diff --git a/riscos/iconbar.c b/riscos/iconbar.c index e0949b3..bcc20d0 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -28,23 +28,24 @@ #include <string.h> #include <time.h> #include <features.h> +#include <oslib/os.h> +#include <oslib/osbyte.h> +#include <oslib/wimp.h> + +#include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "desktop/netsurf.h" +#include "desktop/browser.h" -#include "oslib/os.h" -#include "oslib/osbyte.h" -#include "oslib/wimp.h" #include "riscos/configure.h" #include "riscos/cookies.h" #include "riscos/dialog.h" #include "riscos/global_history.h" #include "riscos/hotlist.h" #include "riscos/iconbar.h" -#include "desktop/netsurf.h" -#include "desktop/browser.h" -#include "utils/nsoption.h" #include "riscos/wimp_event.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" static bool ro_gui_iconbar_click(wimp_pointer *pointer); diff --git a/riscos/image.c b/riscos/image.c index 56feb2b..07baecd 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -17,16 +17,17 @@ */ #include <stdbool.h> -#include "swis.h" -#include "oslib/colourtrans.h" -#include "oslib/osspriteop.h" -#include "riscos/image.h" -#include "riscos/gui.h" +#include <swis.h> +#include <oslib/colourtrans.h> +#include <oslib/osspriteop.h> + #include "utils/nsoption.h" -#include "riscos/tinct.h" #include "utils/log.h" #include "utils/utils.h" +#include "riscos/image.h" +#include "riscos/gui.h" +#include "riscos/tinct.h" static bool image_redraw_tinct(osspriteop_id header, int x, int y, int req_width, int req_height, int width, int height, diff --git a/riscos/plotters.c b/riscos/plotters.c index 0ab39d0..6e49c22 100644 --- a/riscos/plotters.c +++ b/riscos/plotters.c @@ -25,13 +25,16 @@ #include "oslib/colourtrans.h" #include "oslib/draw.h" #include "oslib/os.h" + +#include "utils/log.h" #include "desktop/plotters.h" #include "render/font.h" + #include "riscos/bitmap.h" #include "riscos/image.h" #include "riscos/gui.h" +#include "riscos/font.h" #include "riscos/oslib_pre7.h" -#include "utils/log.h" static bool ro_plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style); diff --git a/riscos/print.c b/riscos/print.c index 16e657b..360ff15 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -21,29 +21,32 @@ #include <assert.h> #include <string.h> -#include "swis.h" -#include "oslib/font.h" -#include "oslib/hourglass.h" -#include "oslib/osfile.h" -#include "oslib/osfind.h" -#include "oslib/pdriver.h" -#include "oslib/wimp.h" -#include "rufl.h" +#include <swis.h> +#include <oslib/font.h> +#include <oslib/hourglass.h> +#include <oslib/osfile.h> +#include <oslib/osfind.h> +#include <oslib/pdriver.h> +#include <oslib/wimp.h> +#include <rufl.h> + #include "utils/config.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/nsoption.h" #include "content/content.h" #include "content/hlcache.h" #include "desktop/browser_private.h" -#include "utils/nsoption.h" #include "desktop/plotters.h" + #include "riscos/dialog.h" #include "riscos/menus.h" #include "riscos/print.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #include "riscos/filetype.h" +#include "riscos/font.h" #define ICON_PRINT_TO_BOTTOM 1 diff --git a/riscos/query.c b/riscos/query.c index 2be2e2a..6f3fca2 100644 --- a/riscos/query.c +++ b/riscos/query.c @@ -18,17 +18,17 @@ #include <stdlib.h> #include <string.h> - #include <stdbool.h> -#include "riscos/dialog.h" -#include "riscos/query.h" -#include "riscos/wimp.h" -#include "riscos/wimp_event.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utf8.h" #include "utils/utils.h" + +#include "riscos/dialog.h" +#include "riscos/query.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" #include "riscos/ucstables.h" #define ICON_QUERY_MESSAGE 0 diff --git a/riscos/save_draw.c b/riscos/save_draw.c index e082332..e8b7faa 100644 --- a/riscos/save_draw.c +++ b/riscos/save_draw.c @@ -26,18 +26,21 @@ #include <assert.h> #include <limits.h> -#include "oslib/draw.h" -#include "oslib/osfile.h" -#include "pencil.h" +#include <oslib/draw.h> +#include <oslib/osfile.h> +#include <pencil.h> + +#include "utils/log.h" +#include "utils/types.h" +#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "desktop/plotters.h" + #include "riscos/bitmap.h" #include "riscos/gui.h" #include "riscos/save_draw.h" -#include "utils/log.h" -#include "utils/types.h" -#include "utils/utils.h" +#include "riscos/font.h" static bool ro_save_draw_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style); static bool ro_save_draw_line(int x0, int y0, int x1, int y1, const plot_style_t *style); diff --git a/riscos/textarea.c b/riscos/textarea.c index 85c9ca3..303b7e7 100644 --- a/riscos/textarea.c +++ b/riscos/textarea.c @@ -24,13 +24,17 @@ #include <stdbool.h> #include <stdint.h> #include <string.h> -#include "swis.h" -#include "oslib/colourtrans.h" -#include "oslib/osbyte.h" -#include "oslib/serviceinternational.h" -#include "oslib/wimp.h" -#include "oslib/wimpspriteop.h" -#include "rufl.h" +#include <swis.h> +#include <oslib/colourtrans.h> +#include <oslib/osbyte.h> +#include <oslib/serviceinternational.h> +#include <oslib/wimp.h> +#include <oslib/wimpspriteop.h> + +#include "utils/log.h" +#include "utils/utf8.h" +#include "desktop/browser.h" + #include "riscos/gui.h" #include "riscos/oslib_pre7.h" #include "riscos/textarea.h" @@ -38,8 +42,6 @@ #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/utf8.h" #define MARGIN_LEFT 8 #define MARGIN_RIGHT 8 diff --git a/riscos/textselection.c b/riscos/textselection.c index 2c85204..f002e07 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -32,6 +32,7 @@ #include "content/hlcache.h" #include "desktop/gui.h" #include "desktop/textinput.h" +#include "desktop/browser.h" #include "riscos/gui.h" #include "riscos/menus.h" diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 5f45cd5..6881de7 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -25,19 +25,22 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "oslib/wimp.h" -#include "content/urldb.h" +#include <oslib/wimp.h> + #include "utils/log.h" +#include "utils/nsoption.h" +#include "utils/utils.h" +#include "content/urldb.h" +#include "desktop/browser.h" + #include "riscos/global_history.h" #include "riscos/gui.h" #include "riscos/mouse.h" -#include "utils/nsoption.h" #include "riscos/toolbar.h" #include "riscos/url_complete.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/utils.h" #include "riscos/filetype.h" #define MAXIMUM_VISIBLE_LINES 7 -- NetSurf Browser

8 years, 12 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-262-gf1c2dde

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/f1c2dde13bf1ca59a466c... ...commit http://git.netsurf-browser.org/netsurf.git/commit/f1c2dde13bf1ca59a466cfe... ...tree http://git.netsurf-browser.org/netsurf.git/tree/f1c2dde13bf1ca59a466cfed2... The branch, master has been updated via f1c2dde13bf1ca59a466cfed2f2d2076c06b235f (commit) from 80bee65a71a7e85cb800e5d1d1f58525c855cb09 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=f1c2dde13bf1ca59a46... commit f1c2dde13bf1ca59a466cfed2f2d2076c06b235f Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> extend file table with mkdir all and make fs backing store use it. enable fs backing store for RISC OS. diff --git a/amiga/misc.c b/amiga/misc.c index ac9912f..6724000 100755 --- a/amiga/misc.c +++ b/amiga/misc.c @@ -19,8 +19,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <sys/types.h> +#include <sys/stat.h> #include <proto/dos.h> #include <proto/exec.h> @@ -362,12 +364,76 @@ static nserror amiga_basename(const char *path, char **str, size_t *size) return NSERROR_OK; } +/** + * Ensure that all directory elements needed to store a filename exist. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +static nserror amiga_mkdir_all(const char *fname) +{ + char *dname; + char *sep; + struct stat sb; + + dname = strdup(fname); + + sep = strrchr(dname, '/'); + if (sep == NULL) { + /* no directory separator path is just filename so its ok */ + free(dname); + return NSERROR_OK; + } + + *sep = 0; /* null terminate directory path */ + + if (stat(dname, &sb) == 0) { + free(dname); + if (S_ISDIR(sb.st_mode)) { + /* path to file exists and is a directory */ + return NSERROR_OK; + } + return NSERROR_NOT_DIRECTORY; + } + *sep = '/'; /* restore separator */ + + sep = dname; + while (*sep == '/') { + sep++; + } + while ((sep = strchr(sep, '/')) != NULL) { + *sep = 0; + if (stat(dname, &sb) != 0) { + if (nsmkdir(dname, S_IRWXU) != 0) { + /* could not create path element */ + free(dname); + return NSERROR_NOT_FOUND; + } + } else { + if (! S_ISDIR(sb.st_mode)) { + /* path element not a directory */ + free(dname); + return NSERROR_NOT_DIRECTORY; + } + } + *sep = '/'; /* restore separator */ + /* skip directory separators */ + while (*sep == '/') { + sep++; + } + } + + free(dname); + return NSERROR_OK; +} + /* amiga file handling operations */ static struct gui_file_table file_table = { .mkpath = amiga_vmkpath, .basename = amiga_basename, .nsurl_to_path = amiga_nsurl_to_path, .path_to_nsurl = amiga_path_to_nsurl, + .mkdir_all = amiga_mkdir_all, }; struct gui_file_table *amiga_file_table = &file_table; diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c index 7ad6492..d29fcaa 100644 --- a/content/fs_backing_store.c +++ b/content/fs_backing_store.c @@ -627,7 +627,7 @@ store_open(struct store_state *state, /** @todo mkdir only on write flag */ /* ensure path to file is usable */ - ret = filepath_mkdir_all(fname); + ret = netsurf_mkdir_all(fname); if (ret != NSERROR_OK) { LOG(("file path \"%s\" could not be created", fname)); free(fname); @@ -835,7 +835,9 @@ write_control(struct store_state *state) return ret; } - ret = filepath_mkdir_all(fname); + LOG(("writing control file \"%s\"", fname)); + + ret = netsurf_mkdir_all(fname); if (ret != NSERROR_OK) { free(fname); return ret; @@ -881,6 +883,8 @@ read_control(struct store_state *state) return ret; } + LOG(("opening control file \"%s\"", fname)); + fcontrol = fopen(fname, "rb"); free(fname); diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c index b3a27fe..fd08674 100644 --- a/desktop/gui_factory.c +++ b/desktop/gui_factory.c @@ -506,6 +506,15 @@ static nserror verify_file_register(struct gui_file_table *gft) if (gft->basename == NULL) { return NSERROR_BAD_PARAMETER; } + if (gft->nsurl_to_path == NULL) { + return NSERROR_BAD_PARAMETER; + } + if (gft->path_to_nsurl == NULL) { + return NSERROR_BAD_PARAMETER; + } + if (gft->mkdir_all == NULL) { + return NSERROR_BAD_PARAMETER; + } return NSERROR_OK; } diff --git a/gtk/gui.c b/gtk/gui.c index 6933c2e..7de448c 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -1092,7 +1092,7 @@ static nserror create_config_home(char **config_home_out) } /* ensure all elements of path exist (the trailing / is required) */ - ret = filepath_mkdir_all(config_home); + ret = netsurf_mkdir_all(config_home); if (ret != NSERROR_OK) { free(config_home); return ret; @@ -1190,7 +1190,7 @@ static nserror create_cache_home(char **cache_home_out) } /* ensure all elements of path exist (the trailing / is required) */ - ret = filepath_mkdir_all(cache_home); + ret = netsurf_mkdir_all(cache_home); if (ret != NSERROR_OK) { free(cache_home); return ret; diff --git a/riscos/Makefile.defaults b/riscos/Makefile.defaults index 8081e5c..f719ee3 100644 --- a/riscos/Makefile.defaults +++ b/riscos/Makefile.defaults @@ -26,5 +26,8 @@ NETSURF_USE_PLUGINS := NO # Valid options: YES, NO NETSURF_USE_DRAW_EXPORT := YES +# Enable building the source object cache filesystem based backing store. +NETSURF_FS_BACKING_STORE := YES + # Optimisation levels CFLAGS += -O2 diff --git a/riscos/gui.c b/riscos/gui.c index e6602ac..4c04c72 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -53,6 +53,7 @@ #include "desktop/netsurf.h" #include "content/urldb.h" #include "content/hlcache.h" +#include "content/backing_store.h" #include "riscos/gui.h" #include "riscos/wimputils.h" @@ -335,22 +336,6 @@ static nserror set_defaults(struct nsoption_s *defaults) } -/** - * Create directory structure for a path - * - * Given a path of x.y.z directories x and x.y will be created - * - * \param path the directory path to create - */ -static void ro_gui_create_dir(char *path) -{ - char *cur = path; - while ((cur = strchr(cur, '.'))) { - *cur = '\0'; - xosfile_create_dir(path, 0); - *cur++ = '.'; - } -} /** @@ -367,23 +352,23 @@ static void ro_gui_create_dirs(void) die("Failed to find NetSurf Choices save path"); snprintf(buf, sizeof(buf), "%s", path); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* URL */ snprintf(buf, sizeof(buf), "%s", nsoption_charp(url_save)); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* Hotlist */ snprintf(buf, sizeof(buf), "%s", nsoption_charp(hotlist_save)); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* Recent */ snprintf(buf, sizeof(buf), "%s", nsoption_charp(recent_save)); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* Theme */ snprintf(buf, sizeof(buf), "%s", nsoption_charp(theme_save)); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* and the final directory part (as theme_save is a directory) */ xosfile_create_dir(buf, 0); } @@ -2338,6 +2323,33 @@ static nserror riscos_basename(const char *path, char **str, size_t *size) /** + * Ensure that all directory elements needed to store a filename exist. + * + * Given a path of x.y.z directories x and x.y will be created. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +static nserror riscos_mkdir_all(const char *fname) +{ + char *dname; + char *cur; + + dname = strdup(fname); + + cur = dname; + while ((cur = strchr(cur, '.'))) { + *cur = '\0'; + xosfile_create_dir(dname, 0); + *cur++ = '.'; + } + + free(dname); + + return NSERROR_OK; +} + +/** * Find screen size in OS units. */ void ro_gui_screen_size(int *width, int *height) @@ -2382,6 +2394,7 @@ static struct gui_file_table riscos_file_table = { .basename = riscos_basename, .nsurl_to_path = ro_nsurl_to_path, .path_to_nsurl = ro_path_to_nsurl, + .mkdir_all = riscos_mkdir_all, }; static struct gui_fetch_table riscos_fetch_table = { @@ -2403,11 +2416,30 @@ static struct gui_browser_table riscos_browser_table = { }; +static char *get_cachepath(void) +{ + char *cachedir; + char *cachepath = NULL; + nserror ret; + + cachedir = getenv("Cache$Dir"); + if ((cachedir == NULL) || (cachedir[0] == 0)) { + LOG(("cachedir was null")); + return NULL; + } + ret = netsurf_mkpath(&cachepath, NULL, 2, cachedir, "NetSurf"); + if (ret != NSERROR_OK) { + return NULL; + } + return cachepath; +} + /** * Normal entry point from RISC OS. */ int main(int argc, char** argv) { + char *cachepath; char path[40]; int length; os_var_type type; @@ -2423,6 +2455,7 @@ int main(int argc, char** argv) .file = &riscos_file_table, .utf8 = riscos_utf8_table, .search = riscos_search_table, + .llcache = filesystem_llcache_table, }; ret = netsurf_register(&riscos_table); @@ -2473,10 +2506,14 @@ int main(int argc, char** argv) die("Failed to locate Messages resource."); } + /* obtain cache path */ + cachepath = get_cachepath(); + /* common initialisation */ - ret = netsurf_init(path, NULL); + ret = netsurf_init(path, cachepath); + free(cachepath); if (ret != NSERROR_OK) { - die("NetSurf failed to initialise"); + die("NetSurf failed to initialise core"); } artworks_init(); diff --git a/utils/file.c b/utils/file.c index a2f1e94..14441e0 100644 --- a/utils/file.c +++ b/utils/file.c @@ -23,6 +23,9 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #include "desktop/gui_factory.h" @@ -195,6 +198,69 @@ static nserror posix_path_to_nsurl(const char *path, struct nsurl **url_out) } /** + * Ensure that all directory elements needed to store a filename exist. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +static nserror posix_mkdir_all(const char *fname) +{ + char *dname; + char *sep; + struct stat sb; + + dname = strdup(fname); + + sep = strrchr(dname, '/'); + if (sep == NULL) { + /* no directory separator path is just filename so its ok */ + free(dname); + return NSERROR_OK; + } + + *sep = 0; /* null terminate directory path */ + + if (stat(dname, &sb) == 0) { + free(dname); + if (S_ISDIR(sb.st_mode)) { + /* path to file exists and is a directory */ + return NSERROR_OK; + } + return NSERROR_NOT_DIRECTORY; + } + *sep = '/'; /* restore separator */ + + sep = dname; + while (*sep == '/') { + sep++; + } + while ((sep = strchr(sep, '/')) != NULL) { + *sep = 0; + if (stat(dname, &sb) != 0) { + if (nsmkdir(dname, S_IRWXU) != 0) { + /* could not create path element */ + free(dname); + return NSERROR_NOT_FOUND; + } + } else { + if (! S_ISDIR(sb.st_mode)) { + /* path element not a directory */ + free(dname); + return NSERROR_NOT_DIRECTORY; + } + } + *sep = '/'; /* restore separator */ + /* skip directory separators */ + while (*sep == '/') { + sep++; + } + } + + free(dname); + return NSERROR_OK; +} + +/** * default to using the posix file handling */ static struct gui_file_table file_table = { @@ -202,6 +268,7 @@ static struct gui_file_table file_table = { .basename = posix_basename, .nsurl_to_path = posix_nsurl_to_path, .path_to_nsurl = posix_path_to_nsurl, + .mkdir_all = posix_mkdir_all, }; struct gui_file_table *default_file_table = &file_table; @@ -230,3 +297,9 @@ nserror netsurf_path_to_nsurl(const char *path, struct nsurl **url) { return guit->file->path_to_nsurl(path, url); } + +/* exported interface documented in utils/file.h */ +nserror netsurf_mkdir_all(const char *fname) +{ + return guit->file->mkdir_all(fname); +} diff --git a/utils/file.h b/utils/file.h index 2e47e1f..7baf2f0 100644 --- a/utils/file.h +++ b/utils/file.h @@ -106,6 +106,14 @@ struct gui_file_table { * code on faliure. */ nserror (*path_to_nsurl)(const char *path, struct nsurl **url); + + /** + * Ensure that all directory elements needed to store a filename exist. + * + * @param[in] fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ + nserror (*mkdir_all)(const char *fname); }; /** Default (posix) file operation table. */ @@ -156,4 +164,12 @@ nserror netsurf_nsurl_to_path(struct nsurl *url, char **path_out); */ nserror netsurf_path_to_nsurl(const char *path, struct nsurl **url); +/** + * Ensure that all directory elements needed to store a filename exist. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +nserror netsurf_mkdir_all(const char *fname); + #endif diff --git a/utils/filepath.c b/utils/filepath.c index c28a821..c07cc48 100644 --- a/utils/filepath.c +++ b/utils/filepath.c @@ -325,60 +325,3 @@ void filepath_free_strvec(char **pathv) free(pathv); } -/* exported interface documented in filepath.h */ -nserror filepath_mkdir_all(const char *fname) -{ - char *dname; - char *sep; - struct stat sb; - - dname = strdup(fname); - - sep = strrchr(dname, '/'); - if (sep == NULL) { - /* no directory separator path is just filename so its ok */ - free(dname); - return NSERROR_OK; - } - - *sep = 0; /* null terminate directory path */ - - if (stat(dname, &sb) == 0) { - free(dname); - if (S_ISDIR(sb.st_mode)) { - /* path to file exists and is a directory */ - return NSERROR_OK; - } - return NSERROR_NOT_DIRECTORY; - } - *sep = '/'; /* restore separator */ - - sep = dname; - while (*sep == '/') { - sep++; - } - while ((sep = strchr(sep, '/')) != NULL) { - *sep = 0; - if (stat(dname, &sb) != 0) { - if (nsmkdir(dname, S_IRWXU) != 0) { - /* could not create path element */ - free(dname); - return NSERROR_NOT_FOUND; - } - } else { - if (! S_ISDIR(sb.st_mode)) { - /* path element not a directory */ - free(dname); - return NSERROR_NOT_DIRECTORY; - } - } - *sep = '/'; /* restore separator */ - /* skip directory separators */ - while (*sep == '/') { - sep++; - } - } - - free(dname); - return NSERROR_OK; -} diff --git a/utils/filepath.h b/utils/filepath.h index 61b7209..ad077e2 100644 --- a/utils/filepath.h +++ b/utils/filepath.h @@ -127,13 +127,5 @@ char **filepath_path_to_strvec(const char *path); void filepath_free_strvec(char **pathv); -/** - * Ensure that all directory elements needed to store a filename exist. - * - * @param fname The filename to ensure the path to exists. - * @return NSERROR_OK on success or error code on failure. - */ -nserror filepath_mkdir_all(const char *fname); - #endif /* _NETSURF_UTILS_FILEPATH_H_ */ diff --git a/windows/gui.c b/windows/gui.c index 8cf36d0..21eff0e 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -2009,12 +2009,76 @@ static nserror windows_path_to_nsurl(const char *path, struct nsurl **url_out) return ret; } +/** + * Ensure that all directory elements needed to store a filename exist. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +static nserror windows_mkdir_all(const char *fname) +{ + char *dname; + char *sep; + struct stat sb; + + dname = strdup(fname); + + sep = strrchr(dname, '\\'); + if (sep == NULL) { + /* no directory separator path is just filename so its ok */ + free(dname); + return NSERROR_OK; + } + + *sep = 0; /* null terminate directory path */ + + if (stat(dname, &sb) == 0) { + free(dname); + if (S_ISDIR(sb.st_mode)) { + /* path to file exists and is a directory */ + return NSERROR_OK; + } + return NSERROR_NOT_DIRECTORY; + } + *sep = '\\'; /* restore separator */ + + sep = dname; + while (*sep == '\\') { + sep++; + } + while ((sep = strchr(sep, '\\')) != NULL) { + *sep = 0; + if (stat(dname, &sb) != 0) { + if (nsmkdir(dname, S_IRWXU) != 0) { + /* could not create path element */ + free(dname); + return NSERROR_NOT_FOUND; + } + } else { + if (! S_ISDIR(sb.st_mode)) { + /* path element not a directory */ + free(dname); + return NSERROR_NOT_DIRECTORY; + } + } + *sep = '\\'; /* restore separator */ + /* skip directory separators */ + while (*sep == '\\') { + sep++; + } + } + + free(dname); + return NSERROR_OK; +} + /* windows file handling */ static struct gui_file_table file_table = { .mkpath = windows_mkpath, .basename = windows_basename, .nsurl_to_path = windows_nsurl_to_path, .path_to_nsurl = windows_path_to_nsurl, + .mkdir_all = windows_mkdir_all, }; struct gui_file_table *win32_file_table = &file_table; ----------------------------------------------------------------------- Summary of changes: amiga/misc.c | 66 +++++++++++++++++++++++++++++++++++ content/fs_backing_store.c | 8 +++- desktop/gui_factory.c | 9 +++++ gtk/gui.c | 4 +- riscos/Makefile.defaults | 3 ++ riscos/gui.c | 83 +++++++++++++++++++++++++++++++------------ utils/file.c | 73 ++++++++++++++++++++++++++++++++++++++ utils/file.h | 16 ++++++++ utils/filepath.c | 57 ------------------------------ utils/filepath.h | 8 ---- windows/gui.c | 64 ++++++++++++++++++++++++++++++++++ 11 files changed, 299 insertions(+), 92 deletions(-) diff --git a/amiga/misc.c b/amiga/misc.c index ac9912f..6724000 100755 --- a/amiga/misc.c +++ b/amiga/misc.c @@ -19,8 +19,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <sys/types.h> +#include <sys/stat.h> #include <proto/dos.h> #include <proto/exec.h> @@ -362,12 +364,76 @@ static nserror amiga_basename(const char *path, char **str, size_t *size) return NSERROR_OK; } +/** + * Ensure that all directory elements needed to store a filename exist. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +static nserror amiga_mkdir_all(const char *fname) +{ + char *dname; + char *sep; + struct stat sb; + + dname = strdup(fname); + + sep = strrchr(dname, '/'); + if (sep == NULL) { + /* no directory separator path is just filename so its ok */ + free(dname); + return NSERROR_OK; + } + + *sep = 0; /* null terminate directory path */ + + if (stat(dname, &sb) == 0) { + free(dname); + if (S_ISDIR(sb.st_mode)) { + /* path to file exists and is a directory */ + return NSERROR_OK; + } + return NSERROR_NOT_DIRECTORY; + } + *sep = '/'; /* restore separator */ + + sep = dname; + while (*sep == '/') { + sep++; + } + while ((sep = strchr(sep, '/')) != NULL) { + *sep = 0; + if (stat(dname, &sb) != 0) { + if (nsmkdir(dname, S_IRWXU) != 0) { + /* could not create path element */ + free(dname); + return NSERROR_NOT_FOUND; + } + } else { + if (! S_ISDIR(sb.st_mode)) { + /* path element not a directory */ + free(dname); + return NSERROR_NOT_DIRECTORY; + } + } + *sep = '/'; /* restore separator */ + /* skip directory separators */ + while (*sep == '/') { + sep++; + } + } + + free(dname); + return NSERROR_OK; +} + /* amiga file handling operations */ static struct gui_file_table file_table = { .mkpath = amiga_vmkpath, .basename = amiga_basename, .nsurl_to_path = amiga_nsurl_to_path, .path_to_nsurl = amiga_path_to_nsurl, + .mkdir_all = amiga_mkdir_all, }; struct gui_file_table *amiga_file_table = &file_table; diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c index 7ad6492..d29fcaa 100644 --- a/content/fs_backing_store.c +++ b/content/fs_backing_store.c @@ -627,7 +627,7 @@ store_open(struct store_state *state, /** @todo mkdir only on write flag */ /* ensure path to file is usable */ - ret = filepath_mkdir_all(fname); + ret = netsurf_mkdir_all(fname); if (ret != NSERROR_OK) { LOG(("file path \"%s\" could not be created", fname)); free(fname); @@ -835,7 +835,9 @@ write_control(struct store_state *state) return ret; } - ret = filepath_mkdir_all(fname); + LOG(("writing control file \"%s\"", fname)); + + ret = netsurf_mkdir_all(fname); if (ret != NSERROR_OK) { free(fname); return ret; @@ -881,6 +883,8 @@ read_control(struct store_state *state) return ret; } + LOG(("opening control file \"%s\"", fname)); + fcontrol = fopen(fname, "rb"); free(fname); diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c index b3a27fe..fd08674 100644 --- a/desktop/gui_factory.c +++ b/desktop/gui_factory.c @@ -506,6 +506,15 @@ static nserror verify_file_register(struct gui_file_table *gft) if (gft->basename == NULL) { return NSERROR_BAD_PARAMETER; } + if (gft->nsurl_to_path == NULL) { + return NSERROR_BAD_PARAMETER; + } + if (gft->path_to_nsurl == NULL) { + return NSERROR_BAD_PARAMETER; + } + if (gft->mkdir_all == NULL) { + return NSERROR_BAD_PARAMETER; + } return NSERROR_OK; } diff --git a/gtk/gui.c b/gtk/gui.c index 6933c2e..7de448c 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -1092,7 +1092,7 @@ static nserror create_config_home(char **config_home_out) } /* ensure all elements of path exist (the trailing / is required) */ - ret = filepath_mkdir_all(config_home); + ret = netsurf_mkdir_all(config_home); if (ret != NSERROR_OK) { free(config_home); return ret; @@ -1190,7 +1190,7 @@ static nserror create_cache_home(char **cache_home_out) } /* ensure all elements of path exist (the trailing / is required) */ - ret = filepath_mkdir_all(cache_home); + ret = netsurf_mkdir_all(cache_home); if (ret != NSERROR_OK) { free(cache_home); return ret; diff --git a/riscos/Makefile.defaults b/riscos/Makefile.defaults index 8081e5c..f719ee3 100644 --- a/riscos/Makefile.defaults +++ b/riscos/Makefile.defaults @@ -26,5 +26,8 @@ NETSURF_USE_PLUGINS := NO # Valid options: YES, NO NETSURF_USE_DRAW_EXPORT := YES +# Enable building the source object cache filesystem based backing store. +NETSURF_FS_BACKING_STORE := YES + # Optimisation levels CFLAGS += -O2 diff --git a/riscos/gui.c b/riscos/gui.c index e6602ac..4c04c72 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -53,6 +53,7 @@ #include "desktop/netsurf.h" #include "content/urldb.h" #include "content/hlcache.h" +#include "content/backing_store.h" #include "riscos/gui.h" #include "riscos/wimputils.h" @@ -335,22 +336,6 @@ static nserror set_defaults(struct nsoption_s *defaults) } -/** - * Create directory structure for a path - * - * Given a path of x.y.z directories x and x.y will be created - * - * \param path the directory path to create - */ -static void ro_gui_create_dir(char *path) -{ - char *cur = path; - while ((cur = strchr(cur, '.'))) { - *cur = '\0'; - xosfile_create_dir(path, 0); - *cur++ = '.'; - } -} /** @@ -367,23 +352,23 @@ static void ro_gui_create_dirs(void) die("Failed to find NetSurf Choices save path"); snprintf(buf, sizeof(buf), "%s", path); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* URL */ snprintf(buf, sizeof(buf), "%s", nsoption_charp(url_save)); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* Hotlist */ snprintf(buf, sizeof(buf), "%s", nsoption_charp(hotlist_save)); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* Recent */ snprintf(buf, sizeof(buf), "%s", nsoption_charp(recent_save)); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* Theme */ snprintf(buf, sizeof(buf), "%s", nsoption_charp(theme_save)); - ro_gui_create_dir(buf); + netsurf_mkdir_all(buf); /* and the final directory part (as theme_save is a directory) */ xosfile_create_dir(buf, 0); } @@ -2338,6 +2323,33 @@ static nserror riscos_basename(const char *path, char **str, size_t *size) /** + * Ensure that all directory elements needed to store a filename exist. + * + * Given a path of x.y.z directories x and x.y will be created. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +static nserror riscos_mkdir_all(const char *fname) +{ + char *dname; + char *cur; + + dname = strdup(fname); + + cur = dname; + while ((cur = strchr(cur, '.'))) { + *cur = '\0'; + xosfile_create_dir(dname, 0); + *cur++ = '.'; + } + + free(dname); + + return NSERROR_OK; +} + +/** * Find screen size in OS units. */ void ro_gui_screen_size(int *width, int *height) @@ -2382,6 +2394,7 @@ static struct gui_file_table riscos_file_table = { .basename = riscos_basename, .nsurl_to_path = ro_nsurl_to_path, .path_to_nsurl = ro_path_to_nsurl, + .mkdir_all = riscos_mkdir_all, }; static struct gui_fetch_table riscos_fetch_table = { @@ -2403,11 +2416,30 @@ static struct gui_browser_table riscos_browser_table = { }; +static char *get_cachepath(void) +{ + char *cachedir; + char *cachepath = NULL; + nserror ret; + + cachedir = getenv("Cache$Dir"); + if ((cachedir == NULL) || (cachedir[0] == 0)) { + LOG(("cachedir was null")); + return NULL; + } + ret = netsurf_mkpath(&cachepath, NULL, 2, cachedir, "NetSurf"); + if (ret != NSERROR_OK) { + return NULL; + } + return cachepath; +} + /** * Normal entry point from RISC OS. */ int main(int argc, char** argv) { + char *cachepath; char path[40]; int length; os_var_type type; @@ -2423,6 +2455,7 @@ int main(int argc, char** argv) .file = &riscos_file_table, .utf8 = riscos_utf8_table, .search = riscos_search_table, + .llcache = filesystem_llcache_table, }; ret = netsurf_register(&riscos_table); @@ -2473,10 +2506,14 @@ int main(int argc, char** argv) die("Failed to locate Messages resource."); } + /* obtain cache path */ + cachepath = get_cachepath(); + /* common initialisation */ - ret = netsurf_init(path, NULL); + ret = netsurf_init(path, cachepath); + free(cachepath); if (ret != NSERROR_OK) { - die("NetSurf failed to initialise"); + die("NetSurf failed to initialise core"); } artworks_init(); diff --git a/utils/file.c b/utils/file.c index a2f1e94..14441e0 100644 --- a/utils/file.c +++ b/utils/file.c @@ -23,6 +23,9 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #include "desktop/gui_factory.h" @@ -195,6 +198,69 @@ static nserror posix_path_to_nsurl(const char *path, struct nsurl **url_out) } /** + * Ensure that all directory elements needed to store a filename exist. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +static nserror posix_mkdir_all(const char *fname) +{ + char *dname; + char *sep; + struct stat sb; + + dname = strdup(fname); + + sep = strrchr(dname, '/'); + if (sep == NULL) { + /* no directory separator path is just filename so its ok */ + free(dname); + return NSERROR_OK; + } + + *sep = 0; /* null terminate directory path */ + + if (stat(dname, &sb) == 0) { + free(dname); + if (S_ISDIR(sb.st_mode)) { + /* path to file exists and is a directory */ + return NSERROR_OK; + } + return NSERROR_NOT_DIRECTORY; + } + *sep = '/'; /* restore separator */ + + sep = dname; + while (*sep == '/') { + sep++; + } + while ((sep = strchr(sep, '/')) != NULL) { + *sep = 0; + if (stat(dname, &sb) != 0) { + if (nsmkdir(dname, S_IRWXU) != 0) { + /* could not create path element */ + free(dname); + return NSERROR_NOT_FOUND; + } + } else { + if (! S_ISDIR(sb.st_mode)) { + /* path element not a directory */ + free(dname); + return NSERROR_NOT_DIRECTORY; + } + } + *sep = '/'; /* restore separator */ + /* skip directory separators */ + while (*sep == '/') { + sep++; + } + } + + free(dname); + return NSERROR_OK; +} + +/** * default to using the posix file handling */ static struct gui_file_table file_table = { @@ -202,6 +268,7 @@ static struct gui_file_table file_table = { .basename = posix_basename, .nsurl_to_path = posix_nsurl_to_path, .path_to_nsurl = posix_path_to_nsurl, + .mkdir_all = posix_mkdir_all, }; struct gui_file_table *default_file_table = &file_table; @@ -230,3 +297,9 @@ nserror netsurf_path_to_nsurl(const char *path, struct nsurl **url) { return guit->file->path_to_nsurl(path, url); } + +/* exported interface documented in utils/file.h */ +nserror netsurf_mkdir_all(const char *fname) +{ + return guit->file->mkdir_all(fname); +} diff --git a/utils/file.h b/utils/file.h index 2e47e1f..7baf2f0 100644 --- a/utils/file.h +++ b/utils/file.h @@ -106,6 +106,14 @@ struct gui_file_table { * code on faliure. */ nserror (*path_to_nsurl)(const char *path, struct nsurl **url); + + /** + * Ensure that all directory elements needed to store a filename exist. + * + * @param[in] fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ + nserror (*mkdir_all)(const char *fname); }; /** Default (posix) file operation table. */ @@ -156,4 +164,12 @@ nserror netsurf_nsurl_to_path(struct nsurl *url, char **path_out); */ nserror netsurf_path_to_nsurl(const char *path, struct nsurl **url); +/** + * Ensure that all directory elements needed to store a filename exist. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +nserror netsurf_mkdir_all(const char *fname); + #endif diff --git a/utils/filepath.c b/utils/filepath.c index c28a821..c07cc48 100644 --- a/utils/filepath.c +++ b/utils/filepath.c @@ -325,60 +325,3 @@ void filepath_free_strvec(char **pathv) free(pathv); } -/* exported interface documented in filepath.h */ -nserror filepath_mkdir_all(const char *fname) -{ - char *dname; - char *sep; - struct stat sb; - - dname = strdup(fname); - - sep = strrchr(dname, '/'); - if (sep == NULL) { - /* no directory separator path is just filename so its ok */ - free(dname); - return NSERROR_OK; - } - - *sep = 0; /* null terminate directory path */ - - if (stat(dname, &sb) == 0) { - free(dname); - if (S_ISDIR(sb.st_mode)) { - /* path to file exists and is a directory */ - return NSERROR_OK; - } - return NSERROR_NOT_DIRECTORY; - } - *sep = '/'; /* restore separator */ - - sep = dname; - while (*sep == '/') { - sep++; - } - while ((sep = strchr(sep, '/')) != NULL) { - *sep = 0; - if (stat(dname, &sb) != 0) { - if (nsmkdir(dname, S_IRWXU) != 0) { - /* could not create path element */ - free(dname); - return NSERROR_NOT_FOUND; - } - } else { - if (! S_ISDIR(sb.st_mode)) { - /* path element not a directory */ - free(dname); - return NSERROR_NOT_DIRECTORY; - } - } - *sep = '/'; /* restore separator */ - /* skip directory separators */ - while (*sep == '/') { - sep++; - } - } - - free(dname); - return NSERROR_OK; -} diff --git a/utils/filepath.h b/utils/filepath.h index 61b7209..ad077e2 100644 --- a/utils/filepath.h +++ b/utils/filepath.h @@ -127,13 +127,5 @@ char **filepath_path_to_strvec(const char *path); void filepath_free_strvec(char **pathv); -/** - * Ensure that all directory elements needed to store a filename exist. - * - * @param fname The filename to ensure the path to exists. - * @return NSERROR_OK on success or error code on failure. - */ -nserror filepath_mkdir_all(const char *fname); - #endif /* _NETSURF_UTILS_FILEPATH_H_ */ diff --git a/windows/gui.c b/windows/gui.c index 8cf36d0..21eff0e 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -2009,12 +2009,76 @@ static nserror windows_path_to_nsurl(const char *path, struct nsurl **url_out) return ret; } +/** + * Ensure that all directory elements needed to store a filename exist. + * + * @param fname The filename to ensure the path to exists. + * @return NSERROR_OK on success or error code on failure. + */ +static nserror windows_mkdir_all(const char *fname) +{ + char *dname; + char *sep; + struct stat sb; + + dname = strdup(fname); + + sep = strrchr(dname, '\\'); + if (sep == NULL) { + /* no directory separator path is just filename so its ok */ + free(dname); + return NSERROR_OK; + } + + *sep = 0; /* null terminate directory path */ + + if (stat(dname, &sb) == 0) { + free(dname); + if (S_ISDIR(sb.st_mode)) { + /* path to file exists and is a directory */ + return NSERROR_OK; + } + return NSERROR_NOT_DIRECTORY; + } + *sep = '\\'; /* restore separator */ + + sep = dname; + while (*sep == '\\') { + sep++; + } + while ((sep = strchr(sep, '\\')) != NULL) { + *sep = 0; + if (stat(dname, &sb) != 0) { + if (nsmkdir(dname, S_IRWXU) != 0) { + /* could not create path element */ + free(dname); + return NSERROR_NOT_FOUND; + } + } else { + if (! S_ISDIR(sb.st_mode)) { + /* path element not a directory */ + free(dname); + return NSERROR_NOT_DIRECTORY; + } + } + *sep = '\\'; /* restore separator */ + /* skip directory separators */ + while (*sep == '\\') { + sep++; + } + } + + free(dname); + return NSERROR_OK; +} + /* windows file handling */ static struct gui_file_table file_table = { .mkpath = windows_mkpath, .basename = windows_basename, .nsurl_to_path = windows_nsurl_to_path, .path_to_nsurl = windows_path_to_nsurl, + .mkdir_all = windows_mkdir_all, }; struct gui_file_table *win32_file_table = &file_table; -- NetSurf Browser

8 years, 12 months

1
0
0 / 0

libdom: branch rupindersingh/libdom updated. release/0.1.0-41-gf9bfe2c

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/f9bfe2c42e3e259cd2f659... ...commit http://git.netsurf-browser.org/libdom.git/commit/f9bfe2c42e3e259cd2f65932... ...tree http://git.netsurf-browser.org/libdom.git/tree/f9bfe2c42e3e259cd2f65932bf... The branch, rupindersingh/libdom has been updated discards 34e346c9c343b7df22b8c378ae83d705b2d8448b (commit) discards ab11dff6a1ff27c1afc8a15bcfcc23470d64cc48 (commit) via f9bfe2c42e3e259cd2f65932bffa52f49e0238ca (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (34e346c9c343b7df22b8c378ae83d705b2d8448b) \ N -- N -- N (f9bfe2c42e3e259cd2f65932bffa52f49e0238ca) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=f9bfe2c42e3e259cd2f6... commit f9bfe2c42e3e259cd2f65932bffa52f49e0238ca Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> TEST generator bug fix Adding Test Cases & DOMTSHandler fix diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 8953047..47dcf75 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -728,7 +728,7 @@ sub generate_method { $method = to_cmethod($ats{'interface'}, $en); my $cast = to_attribute_cast($ats{'interface'}); my $get_attribute = $node->getAttribute("name"); - my $cast_get_attribute = to_get_attribute_cast($get_attribute); + my $cast_get_attribute = to_get_attribute_cast($get_attribute, $ats{'interface'}); my $ns = $dd->find("parameters/param", $node); my $params = "${cast}$ats{'obj'}"; for ($count = 1; $count <= $ns->size; $count++) { @@ -857,7 +857,7 @@ sub generate_attribute_fetcher { my $fetcher = to_attribute_fetcher($ats{'interface'}, "$en"); my $cast = to_attribute_cast($ats{'interface'}); my $get_attribute = $node->getAttribute("name"); - my $cast_get_attribute = to_get_attribute_cast($get_attribute); + my $cast_get_attribute = to_get_attribute_cast($get_attribute, $ats{'interface'}); my $unref = 0; my $temp_node = 0; # Deal with the situation like @@ -1476,7 +1476,8 @@ sub get_prefix { } sub to_get_attribute_cast { my $type = shift; - my $ret = get_get_attribute_prefix($type); + my $interface = shift; + my $ret = get_get_attribute_prefix($type, $interface); if($ret eq "") { return $ret; } @@ -1486,12 +1487,15 @@ sub to_get_attribute_cast { sub get_get_attribute_prefix { my $type = shift; - - if (exists $special_prefix{$type}) { + my $interface = shift; + if ((($interface eq "HTMLCollection") or ($interface eq "HTMLSelectElement")) and ($type eq "length")) { + $prefix = "uint32_t "; + } elsif (exists $special_prefix{$type}) { $prefix = $special_prefix{$type}; } else { $prefix = ""; } + return $prefix; } # This function remain unsed diff --git a/test/testcases/tests/level1/html/HTMLSelectElement05.xml b/test/testcases/tests/level1/html/HTMLSelectElement05.xml new file mode 100644 index 0000000..16c78e1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement05.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement05"> +<metadata> +<title>HTMLSelectElement05</title> +<creator>NIST</creator> +<description> + The length attribute specifies the number of options in this select. + + Retrieve the length attribute from the first SELECT element and + examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5933486"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vlength" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="select" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<length interface="HTMLSelectElement" obj="testNode" var="vlength"/> +<assertEquals actual="vlength" expected="5" id="lengthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken b/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken deleted file mode 100644 index 16c78e1..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement05"> -<metadata> -<title>HTMLSelectElement05</title> -<creator>NIST</creator> -<description> - The length attribute specifies the number of options in this select. - - Retrieve the length attribute from the first SELECT element and - examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5933486"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vlength" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="select" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<length interface="HTMLSelectElement" obj="testNode" var="vlength"/> -<assertEquals actual="vlength" expected="5" id="lengthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement16.xml b/test/testcases/tests/level1/html/HTMLSelectElement16.xml new file mode 100644 index 0000000..a5e9422 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement16.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement16"> +<metadata> +<title>HTMLSelectElement16</title> +<creator>Curt Arnold</creator> +<description> +Removes an option using HTMLSelectElement.remove. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<remove interface="HTMLSelectElement" obj="testNode" index="0"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="4" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="-1" id="selected" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail deleted file mode 100644 index a5e9422..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement16"> -<metadata> -<title>HTMLSelectElement16</title> -<creator>Curt Arnold</creator> -<description> -Removes an option using HTMLSelectElement.remove. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<remove interface="HTMLSelectElement" obj="testNode" index="0"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="4" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="-1" id="selected" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement17.xml b/test/testcases/tests/level1/html/HTMLSelectElement17.xml new file mode 100644 index 0000000..03549ff --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement17.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement17"> +<metadata> +<title>HTMLSelectElement17</title> +<creator>Curt Arnold</creator> +<description> +Removes a non-existant option using HTMLSelectElement.remove. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<remove interface="HTMLSelectElement" obj="testNode" index="6"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="5" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail deleted file mode 100644 index 03549ff..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement17"> -<metadata> -<title>HTMLSelectElement17</title> -<creator>Curt Arnold</creator> -<description> -Removes a non-existant option using HTMLSelectElement.remove. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<remove interface="HTMLSelectElement" obj="testNode" index="6"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="5" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement18.xml b/test/testcases/tests/level1/html/HTMLSelectElement18.xml new file mode 100644 index 0000000..aff29d9 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement18.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement18"> +<metadata> +<title>HTMLSelectElement18</title> +<creator>Curt Arnold</creator> +<description> +Add a new option at the end of an select using HTMLSelectElement.add. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<var name="newOpt" type="Element"/> +<var name="newOptText" type="Text"/> +<var name="opt" type="Element"/> +<var name="optText" type="Text"/> +<var name="optValue" type="DOMString"/> +<var name="retNode" type="Node"/> +<var name="nullNode" type="Node" isNull="true"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<createElement var="newOpt" obj="doc" tagName='"option"'/> +<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> +<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> +<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="nullNode"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> +<lastChild var="opt" obj="testNode" interface="Node"/> +<firstChild var="optText" obj="opt" interface="Node"/> +<nodeValue var="optValue" obj="optText"/> +<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail deleted file mode 100644 index aff29d9..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement18"> -<metadata> -<title>HTMLSelectElement18</title> -<creator>Curt Arnold</creator> -<description> -Add a new option at the end of an select using HTMLSelectElement.add. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<var name="newOpt" type="Element"/> -<var name="newOptText" type="Text"/> -<var name="opt" type="Element"/> -<var name="optText" type="Text"/> -<var name="optValue" type="DOMString"/> -<var name="retNode" type="Node"/> -<var name="nullNode" type="Node" isNull="true"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<createElement var="newOpt" obj="doc" tagName='"option"'/> -<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> -<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> -<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="nullNode"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> -<lastChild var="opt" obj="testNode" interface="Node"/> -<firstChild var="optText" obj="opt" interface="Node"/> -<nodeValue var="optValue" obj="optText"/> -<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement19.xml b/test/testcases/tests/level1/html/HTMLSelectElement19.xml new file mode 100644 index 0000000..5d06fe1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement19.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement19"> +<metadata> +<title>HTMLSelectElement19</title> +<creator>Curt Arnold</creator> +<description> +Add a new option before the selected node using HTMLSelectElement.add. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<var name="newOpt" type="Element"/> +<var name="newOptText" type="Text"/> +<var name="opt" type="Node"/> +<var name="optText" type="Text"/> +<var name="optValue" type="DOMString"/> +<var name="retNode" type="Node"/> +<var name="options" type="HTMLCollection"/> +<var name="selectedNode" type="Node"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<createElement var="newOpt" obj="doc" tagName='"option"'/> +<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> +<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> +<options var="options" obj="testNode"/> +<item var="selectedNode" obj="options" index="0" interface="HTMLCollection"/> +<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="selectedNode"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="1" id="selected" ignoreCase="false"/> +<options var="options" obj="testNode"/> +<item var="opt" obj="options" index="0" interface="HTMLCollection"/> +<firstChild var="optText" obj="opt" interface="Node"/> +<nodeValue var="optValue" obj="optText"/> +<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail deleted file mode 100644 index 5d06fe1..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement19"> -<metadata> -<title>HTMLSelectElement19</title> -<creator>Curt Arnold</creator> -<description> -Add a new option before the selected node using HTMLSelectElement.add. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<var name="newOpt" type="Element"/> -<var name="newOptText" type="Text"/> -<var name="opt" type="Node"/> -<var name="optText" type="Text"/> -<var name="optValue" type="DOMString"/> -<var name="retNode" type="Node"/> -<var name="options" type="HTMLCollection"/> -<var name="selectedNode" type="Node"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<createElement var="newOpt" obj="doc" tagName='"option"'/> -<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> -<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> -<options var="options" obj="testNode"/> -<item var="selectedNode" obj="options" index="0" interface="HTMLCollection"/> -<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="selectedNode"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="1" id="selected" ignoreCase="false"/> -<options var="options" obj="testNode"/> -<item var="opt" obj="options" index="0" interface="HTMLCollection"/> -<firstChild var="optText" obj="opt" interface="Node"/> -<nodeValue var="optValue" obj="optText"/> -<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement21.xml b/test/testcases/tests/level1/html/HTMLTableElement21.xml new file mode 100644 index 0000000..b50a007 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement21.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement21"> +<metadata> +<title>HTMLTableElement21</title> +<creator>NIST</creator> +<description> + The deleteTHead() method deletes the header from the table. + + The deleteTHead() method will delete the THEAD Element from the + second TABLE element. First make sure that the THEAD element exists + and then count the number of rows. After the THEAD element is + deleted there should be one less row. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3831..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vsection2" type="HTMLTableSectionElement" /> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<var name="result" type="List"/> +<var name="expectedResult" type="List"> +<member>4</member> +<member>3</member> +</var> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNotNull actual="vsection1" id="vsection1Id"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<deleteTHead obj="testNode" interface="HTMLTableElement"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail deleted file mode 100644 index b50a007..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement21"> -<metadata> -<title>HTMLTableElement21</title> -<creator>NIST</creator> -<description> - The deleteTHead() method deletes the header from the table. - - The deleteTHead() method will delete the THEAD Element from the - second TABLE element. First make sure that the THEAD element exists - and then count the number of rows. After the THEAD element is - deleted there should be one less row. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3831..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vsection2" type="HTMLTableSectionElement" /> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<var name="result" type="List"/> -<var name="expectedResult" type="List"> -<member>4</member> -<member>3</member> -</var> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNotNull actual="vsection1" id="vsection1Id"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<deleteTHead obj="testNode" interface="HTMLTableElement"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement24.xml b/test/testcases/tests/level1/html/HTMLTableElement24.xml new file mode 100644 index 0000000..58af66e --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement24.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement24"> +<metadata> +<title>HTMLTableElement24</title> +<creator>NIST</creator> +<description> + The deleteTFoot() method deletes the footer from the table. + + The deleteTFoot() method will delete the TFOOT Element from the + second TABLE element. First make sure that the TFOOT element exists + and then count the number of rows. After the TFOOT element is + deleted there should be one less row. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vsection2" type="HTMLTableSectionElement" /> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<var name="result" type="List"/> +<var name="expectedResult" type="List"> +<member>4</member> +<member>3</member> +</var> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNotNull actual="vsection1" id="vsection1Id"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<deleteTFoot obj="testNode" interface="HTMLTableElement"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail deleted file mode 100644 index 58af66e..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement24"> -<metadata> -<title>HTMLTableElement24</title> -<creator>NIST</creator> -<description> - The deleteTFoot() method deletes the footer from the table. - - The deleteTFoot() method will delete the TFOOT Element from the - second TABLE element. First make sure that the TFOOT element exists - and then count the number of rows. After the TFOOT element is - deleted there should be one less row. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vsection2" type="HTMLTableSectionElement" /> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<var name="result" type="List"/> -<var name="expectedResult" type="List"> -<member>4</member> -<member>3</member> -</var> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNotNull actual="vsection1" id="vsection1Id"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<deleteTFoot obj="testNode" interface="HTMLTableElement"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement11.xml b/test/testcases/tests/level1/html/HTMLTableRowElement11.xml new file mode 100644 index 0000000..f284090 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement11.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement11"> +<metadata> +<title>HTMLTableRowElement11</title> +<creator>NIST</creator> +<description> + The insertCell() method inserts an empty TD cell into this row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the first TD element. Invoke the + insertCell() which will create an empty TD cell at the + zero index position. Check the value of the newly created + cell and make sure it is null and also the numbers of cells + should now be seven. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="newCell" type="HTMLElement"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="0"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<assertNull actual="cellNode" id="value2Link"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail deleted file mode 100644 index f284090..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement11"> -<metadata> -<title>HTMLTableRowElement11</title> -<creator>NIST</creator> -<description> - The insertCell() method inserts an empty TD cell into this row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the first TD element. Invoke the - insertCell() which will create an empty TD cell at the - zero index position. Check the value of the newly created - cell and make sure it is null and also the numbers of cells - should now be seven. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="newCell" type="HTMLElement"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="0"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<assertNull actual="cellNode" id="value2Link"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement12.xml b/test/testcases/tests/level1/html/HTMLTableRowElement12.xml new file mode 100644 index 0000000..121954c --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement12.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement12"> +<metadata> +<title>HTMLTableRowElement12</title> +<creator>NIST</creator> +<description> + The insertCell() method inserts an empty TD cell into this row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the last TD element. Invoke the + insertCell() which will append the empty cell to the end of the list. + Check the value of the newly created cell and make sure it is null + and also the numbers of cells should now be seven. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="newCell" type="HTMLElement"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"1230 North Ave. Dallas, Texas 98551"' id="value1Link" ignoreCase="false"/> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="6"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<assertNull actual="cellNode" id="value2Link"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail deleted file mode 100644 index 121954c..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement12"> -<metadata> -<title>HTMLTableRowElement12</title> -<creator>NIST</creator> -<description> - The insertCell() method inserts an empty TD cell into this row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the last TD element. Invoke the - insertCell() which will append the empty cell to the end of the list. - Check the value of the newly created cell and make sure it is null - and also the numbers of cells should now be seven. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="newCell" type="HTMLElement"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"1230 North Ave. Dallas, Texas 98551"' id="value1Link" ignoreCase="false"/> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="6"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<assertNull actual="cellNode" id="value2Link"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement13.xml b/test/testcases/tests/level1/html/HTMLTableRowElement13.xml new file mode 100644 index 0000000..a90f596 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement13.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement13"> +<metadata> +<title>HTMLTableRowElement13</title> +<creator>NIST</creator> +<description> + The deleteCell() method deletes a cell from the current row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the first TD element. Invoke the + deleteCell() method which will delete a cell from the current row. + Check the value of the cell at the zero index and also check + the number of cells which should now be five. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> +<deleteCell interface="HTMLTableRowElement" obj="testNode" index="0"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"Margaret Martin"' id="value2Link" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail deleted file mode 100644 index a90f596..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement13"> -<metadata> -<title>HTMLTableRowElement13</title> -<creator>NIST</creator> -<description> - The deleteCell() method deletes a cell from the current row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the first TD element. Invoke the - deleteCell() method which will delete a cell from the current row. - Check the value of the cell at the zero index and also check - the number of cells which should now be five. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> -<deleteCell interface="HTMLTableRowElement" obj="testNode" index="0"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"Margaret Martin"' id="value2Link" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement14.xml b/test/testcases/tests/level1/html/HTMLTableRowElement14.xml new file mode 100644 index 0000000..27af8e2 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement14.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement14"> +<metadata> +<title>HTMLTableRowElement14</title> +<creator>NIST</creator> +<description> + The deleteCell() method deletes a cell from the current row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the third(index 2) TD element. Invoke the + deleteCell() method which will delete a cell from the current row. + Check the value of the third cell(index 2) and also check + the number of cells which should now be five. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"Accountant"' id="value1Link" ignoreCase="false"/> +<deleteCell interface="HTMLTableRowElement" obj="testNode" index="2"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"56,000"' id="value2Link" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail deleted file mode 100644 index 27af8e2..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement14"> -<metadata> -<title>HTMLTableRowElement14</title> -<creator>NIST</creator> -<description> - The deleteCell() method deletes a cell from the current row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the third(index 2) TD element. Invoke the - deleteCell() method which will delete a cell from the current row. - Check the value of the third cell(index 2) and also check - the number of cells which should now be five. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"Accountant"' id="value1Link" ignoreCase="false"/> -<deleteCell interface="HTMLTableRowElement" obj="testNode" index="2"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"56,000"' id="value2Link" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml new file mode 100644 index 0000000..1110c65 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement13"> +<metadata> +<title>HTMLTableSectionElement13</title> +<creator>NIST</creator> +<description> + The rows attribute specifies the collection of rows in this table section. + + Retrieve the first THEAD element and examine the value of + the rows length attribute. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail deleted file mode 100644 index 1110c65..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement13"> -<metadata> -<title>HTMLTableSectionElement13</title> -<creator>NIST</creator> -<description> - The rows attribute specifies the collection of rows in this table section. - - Retrieve the first THEAD element and examine the value of - the rows length attribute. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml new file mode 100644 index 0000000..83c90c0 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement14"> +<metadata> +<title>HTMLTableSectionElement14</title> +<creator>NIST</creator> +<description> + The rows attribute specifies the collection of rows in this table section. + + Retrieve the first TFOOT element and examine the value of + the rows length attribute. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail deleted file mode 100644 index 83c90c0..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement14"> -<metadata> -<title>HTMLTableSectionElement14</title> -<creator>NIST</creator> -<description> - The rows attribute specifies the collection of rows in this table section. - - Retrieve the first TFOOT element and examine the value of - the rows length attribute. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml new file mode 100644 index 0000000..6c8f0dd --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement15"> +<metadata> +<title>HTMLTableSectionElement15</title> +<creator>NIST</creator> +<description> + The rows attribute specifies the collection of rows in this table section. + + Retrieve the first TBODY element and examine the value of + the rows length attribute. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail deleted file mode 100644 index 6c8f0dd..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement15"> -<metadata> -<title>HTMLTableSectionElement15</title> -<creator>NIST</creator> -<description> - The rows attribute specifies the collection of rows in this table section. - - Retrieve the first TBODY element and examine the value of - the rows length attribute. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml new file mode 100644 index 0000000..567d86b --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement16"> +<metadata> +<title>HTMLTableSectionElement16</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first THEAD element and invoke the insertRow() method + with an index of 0. The nuber of rows in the THEAD section before + insertion of the new row is one. After the new row is inserted the number + of rows in the THEAD section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail deleted file mode 100644 index 567d86b..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement16"> -<metadata> -<title>HTMLTableSectionElement16</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first THEAD element and invoke the insertRow() method - with an index of 0. The nuber of rows in the THEAD section before - insertion of the new row is one. After the new row is inserted the number - of rows in the THEAD section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml new file mode 100644 index 0000000..4a3e283 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement17"> +<metadata> +<title>HTMLTableSectionElement17</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first TFOOT element and invoke the insertRow() method + with an index of 0. The nuber of rows in the TFOOT section before + insertion of the new row is one. After the new row is inserted the number + of rows in the TFOOT section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail deleted file mode 100644 index 4a3e283..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement17"> -<metadata> -<title>HTMLTableSectionElement17</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first TFOOT element and invoke the insertRow() method - with an index of 0. The nuber of rows in the TFOOT section before - insertion of the new row is one. After the new row is inserted the number - of rows in the TFOOT section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml new file mode 100644 index 0000000..e8073be --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement18"> +<metadata> +<title>HTMLTableSectionElement18</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first TBODY element and invoke the insertRow() method + with an index of 0. The nuber of rows in the TBODY section before + insertion of the new row is two. After the new row is inserted the number + of rows in the TBODY section is three. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail deleted file mode 100644 index e8073be..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement18"> -<metadata> -<title>HTMLTableSectionElement18</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first TBODY element and invoke the insertRow() method - with an index of 0. The nuber of rows in the TBODY section before - insertion of the new row is two. After the new row is inserted the number - of rows in the TBODY section is three. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml new file mode 100644 index 0000000..f8d7933 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement19"> +<metadata> +<title>HTMLTableSectionElement19</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first THEAD element and invoke the insertRow() method + with an index of 1. The nuber of rows in the THEAD section before + insertion of the new row is one therefore the new row is appended. + After the new row is inserted the number of rows in the THEAD + section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail deleted file mode 100644 index f8d7933..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement19"> -<metadata> -<title>HTMLTableSectionElement19</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first THEAD element and invoke the insertRow() method - with an index of 1. The nuber of rows in the THEAD section before - insertion of the new row is one therefore the new row is appended. - After the new row is inserted the number of rows in the THEAD - section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml new file mode 100644 index 0000000..99452e7 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement20"> +<metadata> +<title>HTMLTableSectionElement20</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first TFOOT element and invoke the insertRow() method + with an index of one. The nuber of rows in the TFOOT section before + insertion of the new row is one therefore the new row is appended. + After the new row is inserted the number of rows in the TFOOT section + is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail deleted file mode 100644 index 99452e7..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement20"> -<metadata> -<title>HTMLTableSectionElement20</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first TFOOT element and invoke the insertRow() method - with an index of one. The nuber of rows in the TFOOT section before - insertion of the new row is one therefore the new row is appended. - After the new row is inserted the number of rows in the TFOOT section - is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml new file mode 100644 index 0000000..05d7ef8 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement21"> +<metadata> +<title>HTMLTableSectionElement21</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first TBODY element and invoke the insertRow() method + with an index of two. The number of rows in the TBODY section before + insertion of the new row is two therefore the row is appended. + After the new row is inserted the number of rows in the TBODY section is + three. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=502"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="2"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail deleted file mode 100644 index 05d7ef8..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement21"> -<metadata> -<title>HTMLTableSectionElement21</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first TBODY element and invoke the insertRow() method - with an index of two. The number of rows in the TBODY section before - insertion of the new row is two therefore the row is appended. - After the new row is inserted the number of rows in the TBODY section is - three. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=502"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="2"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml new file mode 100644 index 0000000..5d8bef4 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement22"> +<metadata> +<title>HTMLTableSectionElement22</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a row from this section. + + Retrieve the first THEAD element and invoke the deleteRow() method + with an index of 0. The nuber of rows in the THEAD section before + the deletion of the row is one. After the row is deleted the number + of rows in the THEAD section is zero. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="0" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail deleted file mode 100644 index 5d8bef4..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement22"> -<metadata> -<title>HTMLTableSectionElement22</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a row from this section. - - Retrieve the first THEAD element and invoke the deleteRow() method - with an index of 0. The nuber of rows in the THEAD section before - the deletion of the row is one. After the row is deleted the number - of rows in the THEAD section is zero. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="0" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml new file mode 100644 index 0000000..eb3f972 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement23"> +<metadata> +<title>HTMLTableSectionElement23</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a row from this section. + + Retrieve the first TFOOT element and invoke the deleteRow() method + with an index of 0. The nuber of rows in the TFOOT section before + the deletion of the row is one. After the row is deleted the number + of rows in the TFOOT section is zero. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="0" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail deleted file mode 100644 index eb3f972..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement23"> -<metadata> -<title>HTMLTableSectionElement23</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a row from this section. - - Retrieve the first TFOOT element and invoke the deleteRow() method - with an index of 0. The nuber of rows in the TFOOT section before - the deletion of the row is one. After the row is deleted the number - of rows in the TFOOT section is zero. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="0" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml new file mode 100644 index 0000000..39896e1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement24"> +<metadata> +<title>HTMLTableSectionElement24</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a row from this section. + + Retrieve the first TBODY element and invoke the deleteRow() method + with an index of 0. The nuber of rows in the TBODY section before + the deletion of the row is two. After the row is deleted the number + of rows in the TBODY section is one. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail deleted file mode 100644 index 39896e1..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement24"> -<metadata> -<title>HTMLTableSectionElement24</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a row from this section. - - Retrieve the first TBODY element and invoke the deleteRow() method - with an index of 0. The nuber of rows in the TBODY section before - the deletion of the row is two. After the row is deleted the number - of rows in the TBODY section is one. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table06.xml b/test/testcases/tests/level1/html/table06.xml new file mode 100644 index 0000000..3d461f6 --- /dev/null +++ b/test/testcases/tests/level1/html/table06.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table06"> +<metadata> +<title>table06</title> +<creator>Netscape</creator> +<description> +Vertical alignment of data in cells. +The value of attribute valign of the tablesection element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="vvAlign" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> +<vAlign interface="HTMLTableSectionElement" obj="vsection" var="vvAlign"/> +<assertEquals actual="vvAlign" expected='"middle"' id="vAlignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table06.xml.kfail b/test/testcases/tests/level1/html/table06.xml.kfail deleted file mode 100644 index 3d461f6..0000000 --- a/test/testcases/tests/level1/html/table06.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table06"> -<metadata> -<title>table06</title> -<creator>Netscape</creator> -<description> -Vertical alignment of data in cells. -The value of attribute valign of the tablesection element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="vvAlign" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> -<vAlign interface="HTMLTableSectionElement" obj="vsection" var="vvAlign"/> -<assertEquals actual="vvAlign" expected='"middle"' id="vAlignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table07.xml b/test/testcases/tests/level1/html/table07.xml new file mode 100644 index 0000000..4a04d77 --- /dev/null +++ b/test/testcases/tests/level1/html/table07.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table07"> +<metadata> +<title>table07</title> +<creator>Netscape</creator> +<description> +The collection of rows in this table section. +The value of attribute rows of the tablesection element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="vcollection" type="HTMLCollection" /> +<var name="vrows" type="int" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> +<rows interface="HTMLTableSectionElement" obj="vsection" var="vcollection"/> +<length interface="HTMLCollection" obj="vcollection" var="vrows" /> +<assertEquals actual="vrows" expected="1" id="vrowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table07.xml.kfail b/test/testcases/tests/level1/html/table07.xml.kfail deleted file mode 100644 index 4a04d77..0000000 --- a/test/testcases/tests/level1/html/table07.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table07"> -<metadata> -<title>table07</title> -<creator>Netscape</creator> -<description> -The collection of rows in this table section. -The value of attribute rows of the tablesection element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="vcollection" type="HTMLCollection" /> -<var name="vrows" type="int" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> -<rows interface="HTMLTableSectionElement" obj="vsection" var="vcollection"/> -<length interface="HTMLCollection" obj="vcollection" var="vrows" /> -<assertEquals actual="vrows" expected="1" id="vrowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table15.xml b/test/testcases/tests/level1/html/table15.xml new file mode 100644 index 0000000..89455c3 --- /dev/null +++ b/test/testcases/tests/level1/html/table15.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table15"> +<metadata> +<title>table15</title> +<creator>Netscape</creator> +<description> +The collection of rows in this table section. +The value of attribute rows of the tablesection element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="vcollection" type="HTMLCollection" /> +<var name="vrows" type="int" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> +<rows interface="HTMLTableSectionElement" obj="vsection" var="vcollection"/> +<length interface="HTMLCollection" obj="vcollection" var="vrows" /> +<assertEquals actual="vrows" expected="1" id="vrowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table15.xml.kfail b/test/testcases/tests/level1/html/table15.xml.kfail deleted file mode 100644 index 89455c3..0000000 --- a/test/testcases/tests/level1/html/table15.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table15"> -<metadata> -<title>table15</title> -<creator>Netscape</creator> -<description> -The collection of rows in this table section. -The value of attribute rows of the tablesection element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="vcollection" type="HTMLCollection" /> -<var name="vrows" type="int" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> -<rows interface="HTMLTableSectionElement" obj="vsection" var="vcollection"/> -<length interface="HTMLCollection" obj="vcollection" var="vrows" /> -<assertEquals actual="vrows" expected="1" id="vrowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement40.xml b/test/testcases/tests/level2/html/HTMLTableElement40.xml new file mode 100644 index 0000000..154b348 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableElement40.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableElement40"> +<metadata> +<title>HTMLTableElement40</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a table row. If the index is -1 + the last row of the table is deleted. + + Retrieve the second TABLE element and invoke the deleteRow() method + with an index of negative one. Currently there are four rows in the + table. The deleteRow() method is called and now there should be three. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""table""/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableElement" obj="testNode" index="-1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement40.xml.kfail b/test/testcases/tests/level2/html/HTMLTableElement40.xml.kfail deleted file mode 100644 index 154b348..0000000 --- a/test/testcases/tests/level2/html/HTMLTableElement40.xml.kfail +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableElement40"> -<metadata> -<title>HTMLTableElement40</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a table row. If the index is -1 - the last row of the table is deleted. - - Retrieve the second TABLE element and invoke the deleteRow() method - with an index of negative one. Currently there are four rows in the - table. The deleteRow() method is called and now there should be three. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""table""/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableElement" obj="testNode" index="-1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement20.xml b/test/testcases/tests/level2/html/HTMLTableRowElement20.xml new file mode 100644 index 0000000..a879e13 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableRowElement20.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableRowElement20"> +<metadata> +<title>HTMLTableRowElement20</title> +<creator>NIST</creator> +<description> + The insertCell() method inserts an empty TD cell into this row. + If index is -1 or equal to the number of cells, the new cell is + appended. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the last TD element. Invoke the + insertCell() with an index of negative one + which will append the empty cell to the end of the list. + Check the value of the newly created cell and make sure it is null + and also the numbers of cells should now be seven. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-07</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-68927016"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="newCell" type="HTMLElement"/> +<var name="vcells" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tr""/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected=""1230 North Ave. Dallas, Texas 98551"" id="value1Link" ignoreCase="false"/> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="-1"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<assertNull actual="cellNode" id="value2Link"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement20.xml.kfail b/test/testcases/tests/level2/html/HTMLTableRowElement20.xml.kfail deleted file mode 100644 index a879e13..0000000 --- a/test/testcases/tests/level2/html/HTMLTableRowElement20.xml.kfail +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableRowElement20"> -<metadata> -<title>HTMLTableRowElement20</title> -<creator>NIST</creator> -<description> - The insertCell() method inserts an empty TD cell into this row. - If index is -1 or equal to the number of cells, the new cell is - appended. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the last TD element. Invoke the - insertCell() with an index of negative one - which will append the empty cell to the end of the list. - Check the value of the newly created cell and make sure it is null - and also the numbers of cells should now be seven. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-07</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-68927016"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="newCell" type="HTMLElement"/> -<var name="vcells" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tr""/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected=""1230 North Ave. Dallas, Texas 98551"" id="value1Link" ignoreCase="false"/> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="-1"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<assertNull actual="cellNode" id="value2Link"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement21.xml b/test/testcases/tests/level2/html/HTMLTableRowElement21.xml new file mode 100644 index 0000000..9d5a598 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableRowElement21.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableRowElement21"> +<metadata> +<title>HTMLTableRowElement21</title> +<creator>NIST</creator> +<description> + The deleteCell() method deletes a cell from the currtent row. If + the index is -1 the last cell in the row is deleted. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the last TD element. Invoke the + deleteCell() with an index of negative one + which will delete the last cell in the row. + Check the value of the of the last cell + and also the numbers of cells should now be five. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-07</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-11738598"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="vcells" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tr""/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected=""1230 North Ave. Dallas, Texas 98551"" id="value1Link" ignoreCase="false"/> +<deleteCell interface="HTMLTableRowElement" obj="testNode" index="-1"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="4"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"Female"' id="value2Link" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement21.xml.kfail b/test/testcases/tests/level2/html/HTMLTableRowElement21.xml.kfail deleted file mode 100644 index 9d5a598..0000000 --- a/test/testcases/tests/level2/html/HTMLTableRowElement21.xml.kfail +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableRowElement21"> -<metadata> -<title>HTMLTableRowElement21</title> -<creator>NIST</creator> -<description> - The deleteCell() method deletes a cell from the currtent row. If - the index is -1 the last cell in the row is deleted. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the last TD element. Invoke the - deleteCell() with an index of negative one - which will delete the last cell in the row. - Check the value of the of the last cell - and also the numbers of cells should now be five. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-07</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-11738598"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="vcells" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tr""/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected=""1230 North Ave. Dallas, Texas 98551"" id="value1Link" ignoreCase="false"/> -<deleteCell interface="HTMLTableRowElement" obj="testNode" index="-1"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="4"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"Female"' id="value2Link" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml b/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml new file mode 100644 index 0000000..8fd17c2 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableSectionElement30"> +<metadata> +<title>HTMLTableSectionElement30</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. The new + row is inserted immediately before the current indexth row in this + section. If index is -1 or equal to the number of rows in this section, + the new row is appended. + + Retrieve the first THEAD element and invoke the insertRow() method + with an index of negative one. Since the index is negative one the + new row is appended. + After the new row is appended the number of rows in the THEAD + section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-07</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-93995626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""thead""/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="-1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml.kfail b/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml.kfail deleted file mode 100644 index 8fd17c2..0000000 --- a/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml.kfail +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableSectionElement30"> -<metadata> -<title>HTMLTableSectionElement30</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. The new - row is inserted immediately before the current indexth row in this - section. If index is -1 or equal to the number of rows in this section, - the new row is appended. - - Retrieve the first THEAD element and invoke the insertRow() method - with an index of negative one. Since the index is negative one the - new row is appended. - After the new row is appended the number of rows in the THEAD - section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-07</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-93995626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""thead""/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="-1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml b/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml new file mode 100644 index 0000000..55464e2 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableSectionElement31"> +<metadata> +<title>HTMLTableSectionElement31</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a row from this section. The index + starts from 0 and is relative only to the rows contained inside + this section, not all the rows in the table. If the index is -1 + the last row will be deleted. + + Retrieve the second TBODY element and invoke the deleteRow() method + with an index of -1. The nuber of rows in the THEAD section before + the deletion of the row is two. After the row is deleted the number + of rows in the TBODY section is one. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-07</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-5625626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tbody""/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="-1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml.kfail b/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml.kfail deleted file mode 100644 index 55464e2..0000000 --- a/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml.kfail +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableSectionElement31"> -<metadata> -<title>HTMLTableSectionElement31</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a row from this section. The index - starts from 0 and is relative only to the rows contained inside - this section, not all the rows in the table. If the index is -1 - the last row will be deleted. - - Retrieve the second TBODY element and invoke the deleteRow() method - with an index of -1. The nuber of rows in the THEAD section before - the deletion of the row is two. After the row is deleted the number - of rows in the TBODY section is one. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-07</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-5625626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tbody""/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="-1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink2" ignoreCase="false"/> -</test> ----------------------------------------------------------------------- Summary of changes: -- Document Object Model library

8 years, 12 months

1
0
0 / 0

libdom: branch rupindersingh/libdom updated. release/0.1.0-42-g34e346c

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/34e346c9c343b7df22b8c3... ...commit http://git.netsurf-browser.org/libdom.git/commit/34e346c9c343b7df22b8c378... ...tree http://git.netsurf-browser.org/libdom.git/tree/34e346c9c343b7df22b8c378ae... The branch, rupindersingh/libdom has been updated discards 9117f95e21ed5288399fd199df669e89a5509cb3 (commit) discards 6b311c102f62d15a48495c98dd2b7f722054b0bb (commit) discards 53905a8452532efee5d90129d8c64e84c9ce849a (commit) discards b8b08c5110e243c628f3ed7a625c196a1122cfbe (commit) discards e03bb7d7db601fb8e726c03eb3b37e35fd4d22dc (commit) discards 8326c21c6847e2b7633bd28d8b0f4133136ea533 (commit) discards fb0f94b8aa4f097c4518d18693be16a9bb5b7c0d (commit) discards 98d75ed5b66d25c0dc4f3a70e4dc6de31f05e2f5 (commit) via 34e346c9c343b7df22b8c378ae83d705b2d8448b (commit) via ab11dff6a1ff27c1afc8a15bcfcc23470d64cc48 (commit) via f9178b8cdfd99e96f7535a2f473ce99e90274a6f (commit) via 6997e7a6e476bfd3a630a8bbbea3a99f8a0aaef6 (commit) via d2cac62f6899c3d46dde5ec5a36f82e593e21d9c (commit) via 47c4541c38fd3d21cc13d3a7dfe28cba219e5671 (commit) via cddc5afe1d6c11e1f29231f96d98e8731ec80987 (commit) via c749ad0e5f04cd8a34f06f0aa6511396b9c8af34 (commit) via 84b829ca717840101d5ee3cfe401797d52399da2 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (9117f95e21ed5288399fd199df669e89a5509cb3) \ N -- N -- N (34e346c9c343b7df22b8c378ae83d705b2d8448b) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=34e346c9c343b7df22b8... commit 34e346c9c343b7df22b8c378ae83d705b2d8448b Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> Adding Test Cases & DOMTSHandler fix diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 1ce2a99..47dcf75 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -1488,15 +1488,14 @@ sub to_get_attribute_cast { sub get_get_attribute_prefix { my $type = shift; my $interface = shift; - if (exists $special_prefix{$type}) { + if ((($interface eq "HTMLCollection") or ($interface eq "HTMLSelectElement")) and ($type eq "length")) { + $prefix = "uint32_t "; + } elsif (exists $special_prefix{$type}) { $prefix = $special_prefix{$type}; } else { $prefix = ""; } -#eceptional case - if ($interfac eq "HTMLCollection" and $type eq "length") { - $prefix = "(uint32_t *)"; - } + return $prefix; } # This function remain unsed diff --git a/test/testcases/tests/level1/html/HTMLSelectElement05.xml b/test/testcases/tests/level1/html/HTMLSelectElement05.xml new file mode 100644 index 0000000..16c78e1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement05.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement05"> +<metadata> +<title>HTMLSelectElement05</title> +<creator>NIST</creator> +<description> + The length attribute specifies the number of options in this select. + + Retrieve the length attribute from the first SELECT element and + examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5933486"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vlength" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="select" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<length interface="HTMLSelectElement" obj="testNode" var="vlength"/> +<assertEquals actual="vlength" expected="5" id="lengthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken b/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken deleted file mode 100644 index 16c78e1..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement05"> -<metadata> -<title>HTMLSelectElement05</title> -<creator>NIST</creator> -<description> - The length attribute specifies the number of options in this select. - - Retrieve the length attribute from the first SELECT element and - examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5933486"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vlength" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="select" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<length interface="HTMLSelectElement" obj="testNode" var="vlength"/> -<assertEquals actual="vlength" expected="5" id="lengthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement16.xml b/test/testcases/tests/level1/html/HTMLSelectElement16.xml new file mode 100644 index 0000000..a5e9422 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement16.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement16"> +<metadata> +<title>HTMLSelectElement16</title> +<creator>Curt Arnold</creator> +<description> +Removes an option using HTMLSelectElement.remove. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<remove interface="HTMLSelectElement" obj="testNode" index="0"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="4" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="-1" id="selected" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail deleted file mode 100644 index a5e9422..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement16"> -<metadata> -<title>HTMLSelectElement16</title> -<creator>Curt Arnold</creator> -<description> -Removes an option using HTMLSelectElement.remove. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<remove interface="HTMLSelectElement" obj="testNode" index="0"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="4" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="-1" id="selected" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement17.xml b/test/testcases/tests/level1/html/HTMLSelectElement17.xml new file mode 100644 index 0000000..03549ff --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement17.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement17"> +<metadata> +<title>HTMLSelectElement17</title> +<creator>Curt Arnold</creator> +<description> +Removes a non-existant option using HTMLSelectElement.remove. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<remove interface="HTMLSelectElement" obj="testNode" index="6"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="5" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail deleted file mode 100644 index 03549ff..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement17"> -<metadata> -<title>HTMLSelectElement17</title> -<creator>Curt Arnold</creator> -<description> -Removes a non-existant option using HTMLSelectElement.remove. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<remove interface="HTMLSelectElement" obj="testNode" index="6"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="5" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement18.xml b/test/testcases/tests/level1/html/HTMLSelectElement18.xml new file mode 100644 index 0000000..aff29d9 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement18.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement18"> +<metadata> +<title>HTMLSelectElement18</title> +<creator>Curt Arnold</creator> +<description> +Add a new option at the end of an select using HTMLSelectElement.add. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<var name="newOpt" type="Element"/> +<var name="newOptText" type="Text"/> +<var name="opt" type="Element"/> +<var name="optText" type="Text"/> +<var name="optValue" type="DOMString"/> +<var name="retNode" type="Node"/> +<var name="nullNode" type="Node" isNull="true"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<createElement var="newOpt" obj="doc" tagName='"option"'/> +<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> +<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> +<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="nullNode"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> +<lastChild var="opt" obj="testNode" interface="Node"/> +<firstChild var="optText" obj="opt" interface="Node"/> +<nodeValue var="optValue" obj="optText"/> +<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail deleted file mode 100644 index aff29d9..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement18"> -<metadata> -<title>HTMLSelectElement18</title> -<creator>Curt Arnold</creator> -<description> -Add a new option at the end of an select using HTMLSelectElement.add. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<var name="newOpt" type="Element"/> -<var name="newOptText" type="Text"/> -<var name="opt" type="Element"/> -<var name="optText" type="Text"/> -<var name="optValue" type="DOMString"/> -<var name="retNode" type="Node"/> -<var name="nullNode" type="Node" isNull="true"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<createElement var="newOpt" obj="doc" tagName='"option"'/> -<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> -<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> -<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="nullNode"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> -<lastChild var="opt" obj="testNode" interface="Node"/> -<firstChild var="optText" obj="opt" interface="Node"/> -<nodeValue var="optValue" obj="optText"/> -<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement19.xml b/test/testcases/tests/level1/html/HTMLSelectElement19.xml new file mode 100644 index 0000000..5d06fe1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement19.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement19"> +<metadata> +<title>HTMLSelectElement19</title> +<creator>Curt Arnold</creator> +<description> +Add a new option before the selected node using HTMLSelectElement.add. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<var name="newOpt" type="Element"/> +<var name="newOptText" type="Text"/> +<var name="opt" type="Node"/> +<var name="optText" type="Text"/> +<var name="optValue" type="DOMString"/> +<var name="retNode" type="Node"/> +<var name="options" type="HTMLCollection"/> +<var name="selectedNode" type="Node"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<createElement var="newOpt" obj="doc" tagName='"option"'/> +<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> +<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> +<options var="options" obj="testNode"/> +<item var="selectedNode" obj="options" index="0" interface="HTMLCollection"/> +<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="selectedNode"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="1" id="selected" ignoreCase="false"/> +<options var="options" obj="testNode"/> +<item var="opt" obj="options" index="0" interface="HTMLCollection"/> +<firstChild var="optText" obj="opt" interface="Node"/> +<nodeValue var="optValue" obj="optText"/> +<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail deleted file mode 100644 index 5d06fe1..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement19"> -<metadata> -<title>HTMLSelectElement19</title> -<creator>Curt Arnold</creator> -<description> -Add a new option before the selected node using HTMLSelectElement.add. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<var name="newOpt" type="Element"/> -<var name="newOptText" type="Text"/> -<var name="opt" type="Node"/> -<var name="optText" type="Text"/> -<var name="optValue" type="DOMString"/> -<var name="retNode" type="Node"/> -<var name="options" type="HTMLCollection"/> -<var name="selectedNode" type="Node"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<createElement var="newOpt" obj="doc" tagName='"option"'/> -<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> -<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> -<options var="options" obj="testNode"/> -<item var="selectedNode" obj="options" index="0" interface="HTMLCollection"/> -<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="selectedNode"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="1" id="selected" ignoreCase="false"/> -<options var="options" obj="testNode"/> -<item var="opt" obj="options" index="0" interface="HTMLCollection"/> -<firstChild var="optText" obj="opt" interface="Node"/> -<nodeValue var="optValue" obj="optText"/> -<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement21.xml b/test/testcases/tests/level1/html/HTMLTableElement21.xml new file mode 100644 index 0000000..b50a007 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement21.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement21"> +<metadata> +<title>HTMLTableElement21</title> +<creator>NIST</creator> +<description> + The deleteTHead() method deletes the header from the table. + + The deleteTHead() method will delete the THEAD Element from the + second TABLE element. First make sure that the THEAD element exists + and then count the number of rows. After the THEAD element is + deleted there should be one less row. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3831..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vsection2" type="HTMLTableSectionElement" /> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<var name="result" type="List"/> +<var name="expectedResult" type="List"> +<member>4</member> +<member>3</member> +</var> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNotNull actual="vsection1" id="vsection1Id"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<deleteTHead obj="testNode" interface="HTMLTableElement"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail deleted file mode 100644 index b50a007..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement21"> -<metadata> -<title>HTMLTableElement21</title> -<creator>NIST</creator> -<description> - The deleteTHead() method deletes the header from the table. - - The deleteTHead() method will delete the THEAD Element from the - second TABLE element. First make sure that the THEAD element exists - and then count the number of rows. After the THEAD element is - deleted there should be one less row. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3831..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vsection2" type="HTMLTableSectionElement" /> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<var name="result" type="List"/> -<var name="expectedResult" type="List"> -<member>4</member> -<member>3</member> -</var> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNotNull actual="vsection1" id="vsection1Id"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<deleteTHead obj="testNode" interface="HTMLTableElement"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement24.xml b/test/testcases/tests/level1/html/HTMLTableElement24.xml new file mode 100644 index 0000000..58af66e --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement24.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement24"> +<metadata> +<title>HTMLTableElement24</title> +<creator>NIST</creator> +<description> + The deleteTFoot() method deletes the footer from the table. + + The deleteTFoot() method will delete the TFOOT Element from the + second TABLE element. First make sure that the TFOOT element exists + and then count the number of rows. After the TFOOT element is + deleted there should be one less row. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vsection2" type="HTMLTableSectionElement" /> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<var name="result" type="List"/> +<var name="expectedResult" type="List"> +<member>4</member> +<member>3</member> +</var> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNotNull actual="vsection1" id="vsection1Id"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<deleteTFoot obj="testNode" interface="HTMLTableElement"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail deleted file mode 100644 index 58af66e..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement24"> -<metadata> -<title>HTMLTableElement24</title> -<creator>NIST</creator> -<description> - The deleteTFoot() method deletes the footer from the table. - - The deleteTFoot() method will delete the TFOOT Element from the - second TABLE element. First make sure that the TFOOT element exists - and then count the number of rows. After the TFOOT element is - deleted there should be one less row. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vsection2" type="HTMLTableSectionElement" /> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<var name="result" type="List"/> -<var name="expectedResult" type="List"> -<member>4</member> -<member>3</member> -</var> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNotNull actual="vsection1" id="vsection1Id"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<deleteTFoot obj="testNode" interface="HTMLTableElement"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement11.xml b/test/testcases/tests/level1/html/HTMLTableRowElement11.xml new file mode 100644 index 0000000..f284090 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement11.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement11"> +<metadata> +<title>HTMLTableRowElement11</title> +<creator>NIST</creator> +<description> + The insertCell() method inserts an empty TD cell into this row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the first TD element. Invoke the + insertCell() which will create an empty TD cell at the + zero index position. Check the value of the newly created + cell and make sure it is null and also the numbers of cells + should now be seven. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="newCell" type="HTMLElement"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="0"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<assertNull actual="cellNode" id="value2Link"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail deleted file mode 100644 index f284090..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement11"> -<metadata> -<title>HTMLTableRowElement11</title> -<creator>NIST</creator> -<description> - The insertCell() method inserts an empty TD cell into this row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the first TD element. Invoke the - insertCell() which will create an empty TD cell at the - zero index position. Check the value of the newly created - cell and make sure it is null and also the numbers of cells - should now be seven. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="newCell" type="HTMLElement"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="0"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<assertNull actual="cellNode" id="value2Link"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement12.xml b/test/testcases/tests/level1/html/HTMLTableRowElement12.xml new file mode 100644 index 0000000..121954c --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement12.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement12"> +<metadata> +<title>HTMLTableRowElement12</title> +<creator>NIST</creator> +<description> + The insertCell() method inserts an empty TD cell into this row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the last TD element. Invoke the + insertCell() which will append the empty cell to the end of the list. + Check the value of the newly created cell and make sure it is null + and also the numbers of cells should now be seven. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="newCell" type="HTMLElement"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"1230 North Ave. Dallas, Texas 98551"' id="value1Link" ignoreCase="false"/> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="6"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<assertNull actual="cellNode" id="value2Link"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail deleted file mode 100644 index 121954c..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement12"> -<metadata> -<title>HTMLTableRowElement12</title> -<creator>NIST</creator> -<description> - The insertCell() method inserts an empty TD cell into this row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the last TD element. Invoke the - insertCell() which will append the empty cell to the end of the list. - Check the value of the newly created cell and make sure it is null - and also the numbers of cells should now be seven. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="newCell" type="HTMLElement"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"1230 North Ave. Dallas, Texas 98551"' id="value1Link" ignoreCase="false"/> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="6"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<assertNull actual="cellNode" id="value2Link"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement13.xml b/test/testcases/tests/level1/html/HTMLTableRowElement13.xml new file mode 100644 index 0000000..a90f596 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement13.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement13"> +<metadata> +<title>HTMLTableRowElement13</title> +<creator>NIST</creator> +<description> + The deleteCell() method deletes a cell from the current row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the first TD element. Invoke the + deleteCell() method which will delete a cell from the current row. + Check the value of the cell at the zero index and also check + the number of cells which should now be five. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> +<deleteCell interface="HTMLTableRowElement" obj="testNode" index="0"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"Margaret Martin"' id="value2Link" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail deleted file mode 100644 index a90f596..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement13"> -<metadata> -<title>HTMLTableRowElement13</title> -<creator>NIST</creator> -<description> - The deleteCell() method deletes a cell from the current row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the first TD element. Invoke the - deleteCell() method which will delete a cell from the current row. - Check the value of the cell at the zero index and also check - the number of cells which should now be five. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> -<deleteCell interface="HTMLTableRowElement" obj="testNode" index="0"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"Margaret Martin"' id="value2Link" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement14.xml b/test/testcases/tests/level1/html/HTMLTableRowElement14.xml new file mode 100644 index 0000000..27af8e2 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement14.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement14"> +<metadata> +<title>HTMLTableRowElement14</title> +<creator>NIST</creator> +<description> + The deleteCell() method deletes a cell from the current row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the third(index 2) TD element. Invoke the + deleteCell() method which will delete a cell from the current row. + Check the value of the third cell(index 2) and also check + the number of cells which should now be five. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"Accountant"' id="value1Link" ignoreCase="false"/> +<deleteCell interface="HTMLTableRowElement" obj="testNode" index="2"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"56,000"' id="value2Link" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail deleted file mode 100644 index 27af8e2..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement14"> -<metadata> -<title>HTMLTableRowElement14</title> -<creator>NIST</creator> -<description> - The deleteCell() method deletes a cell from the current row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the third(index 2) TD element. Invoke the - deleteCell() method which will delete a cell from the current row. - Check the value of the third cell(index 2) and also check - the number of cells which should now be five. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"Accountant"' id="value1Link" ignoreCase="false"/> -<deleteCell interface="HTMLTableRowElement" obj="testNode" index="2"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"56,000"' id="value2Link" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml new file mode 100644 index 0000000..1110c65 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement13"> +<metadata> +<title>HTMLTableSectionElement13</title> +<creator>NIST</creator> +<description> + The rows attribute specifies the collection of rows in this table section. + + Retrieve the first THEAD element and examine the value of + the rows length attribute. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail deleted file mode 100644 index 1110c65..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement13.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement13"> -<metadata> -<title>HTMLTableSectionElement13</title> -<creator>NIST</creator> -<description> - The rows attribute specifies the collection of rows in this table section. - - Retrieve the first THEAD element and examine the value of - the rows length attribute. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml new file mode 100644 index 0000000..83c90c0 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement14"> +<metadata> +<title>HTMLTableSectionElement14</title> +<creator>NIST</creator> +<description> + The rows attribute specifies the collection of rows in this table section. + + Retrieve the first TFOOT element and examine the value of + the rows length attribute. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail deleted file mode 100644 index 83c90c0..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement14.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement14"> -<metadata> -<title>HTMLTableSectionElement14</title> -<creator>NIST</creator> -<description> - The rows attribute specifies the collection of rows in this table section. - - Retrieve the first TFOOT element and examine the value of - the rows length attribute. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml new file mode 100644 index 0000000..6c8f0dd --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement15"> +<metadata> +<title>HTMLTableSectionElement15</title> +<creator>NIST</creator> +<description> + The rows attribute specifies the collection of rows in this table section. + + Retrieve the first TBODY element and examine the value of + the rows length attribute. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail deleted file mode 100644 index 6c8f0dd..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement15.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement15"> -<metadata> -<title>HTMLTableSectionElement15</title> -<creator>NIST</creator> -<description> - The rows attribute specifies the collection of rows in this table section. - - Retrieve the first TBODY element and examine the value of - the rows length attribute. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5209..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml new file mode 100644 index 0000000..567d86b --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement16"> +<metadata> +<title>HTMLTableSectionElement16</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first THEAD element and invoke the insertRow() method + with an index of 0. The nuber of rows in the THEAD section before + insertion of the new row is one. After the new row is inserted the number + of rows in the THEAD section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail deleted file mode 100644 index 567d86b..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement16.xml.kfail +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement16"> -<metadata> -<title>HTMLTableSectionElement16</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first THEAD element and invoke the insertRow() method - with an index of 0. The nuber of rows in the THEAD section before - insertion of the new row is one. After the new row is inserted the number - of rows in the THEAD section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml new file mode 100644 index 0000000..4a3e283 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement17"> +<metadata> +<title>HTMLTableSectionElement17</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first TFOOT element and invoke the insertRow() method + with an index of 0. The nuber of rows in the TFOOT section before + insertion of the new row is one. After the new row is inserted the number + of rows in the TFOOT section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail deleted file mode 100644 index 4a3e283..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement17.xml.kfail +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement17"> -<metadata> -<title>HTMLTableSectionElement17</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first TFOOT element and invoke the insertRow() method - with an index of 0. The nuber of rows in the TFOOT section before - insertion of the new row is one. After the new row is inserted the number - of rows in the TFOOT section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml new file mode 100644 index 0000000..e8073be --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement18"> +<metadata> +<title>HTMLTableSectionElement18</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first TBODY element and invoke the insertRow() method + with an index of 0. The nuber of rows in the TBODY section before + insertion of the new row is two. After the new row is inserted the number + of rows in the TBODY section is three. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail deleted file mode 100644 index e8073be..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement18.xml.kfail +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement18"> -<metadata> -<title>HTMLTableSectionElement18</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first TBODY element and invoke the insertRow() method - with an index of 0. The nuber of rows in the TBODY section before - insertion of the new row is two. After the new row is inserted the number - of rows in the TBODY section is three. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml new file mode 100644 index 0000000..f8d7933 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement19"> +<metadata> +<title>HTMLTableSectionElement19</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first THEAD element and invoke the insertRow() method + with an index of 1. The nuber of rows in the THEAD section before + insertion of the new row is one therefore the new row is appended. + After the new row is inserted the number of rows in the THEAD + section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail deleted file mode 100644 index f8d7933..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement19.xml.kfail +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement19"> -<metadata> -<title>HTMLTableSectionElement19</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first THEAD element and invoke the insertRow() method - with an index of 1. The nuber of rows in the THEAD section before - insertion of the new row is one therefore the new row is appended. - After the new row is inserted the number of rows in the THEAD - section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml new file mode 100644 index 0000000..99452e7 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement20"> +<metadata> +<title>HTMLTableSectionElement20</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first TFOOT element and invoke the insertRow() method + with an index of one. The nuber of rows in the TFOOT section before + insertion of the new row is one therefore the new row is appended. + After the new row is inserted the number of rows in the TFOOT section + is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail deleted file mode 100644 index 99452e7..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement20.xml.kfail +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement20"> -<metadata> -<title>HTMLTableSectionElement20</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first TFOOT element and invoke the insertRow() method - with an index of one. The nuber of rows in the TFOOT section before - insertion of the new row is one therefore the new row is appended. - After the new row is inserted the number of rows in the TFOOT section - is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml new file mode 100644 index 0000000..05d7ef8 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement21"> +<metadata> +<title>HTMLTableSectionElement21</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the first TBODY element and invoke the insertRow() method + with an index of two. The number of rows in the TBODY section before + insertion of the new row is two therefore the row is appended. + After the new row is inserted the number of rows in the TBODY section is + three. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> +<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=502"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="2"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail deleted file mode 100644 index 05d7ef8..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement21.xml.kfail +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement21"> -<metadata> -<title>HTMLTableSectionElement21</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the first TBODY element and invoke the insertRow() method - with an index of two. The number of rows in the TBODY section before - insertion of the new row is two therefore the row is appended. - After the new row is inserted the number of rows in the TBODY section is - three. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9399..."/> -<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=502"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="2"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml new file mode 100644 index 0000000..5d8bef4 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement22"> +<metadata> +<title>HTMLTableSectionElement22</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a row from this section. + + Retrieve the first THEAD element and invoke the deleteRow() method + with an index of 0. The nuber of rows in the THEAD section before + the deletion of the row is one. After the row is deleted the number + of rows in the THEAD section is zero. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="0" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail deleted file mode 100644 index 5d8bef4..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement22.xml.kfail +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement22"> -<metadata> -<title>HTMLTableSectionElement22</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a row from this section. - - Retrieve the first THEAD element and invoke the deleteRow() method - with an index of 0. The nuber of rows in the THEAD section before - the deletion of the row is one. After the row is deleted the number - of rows in the THEAD section is zero. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"thead"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="0" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml new file mode 100644 index 0000000..eb3f972 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement23"> +<metadata> +<title>HTMLTableSectionElement23</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a row from this section. + + Retrieve the first TFOOT element and invoke the deleteRow() method + with an index of 0. The nuber of rows in the TFOOT section before + the deletion of the row is one. After the row is deleted the number + of rows in the TFOOT section is zero. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="0" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail deleted file mode 100644 index eb3f972..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement23.xml.kfail +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement23"> -<metadata> -<title>HTMLTableSectionElement23</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a row from this section. - - Retrieve the first TFOOT element and invoke the deleteRow() method - with an index of 0. The nuber of rows in the TFOOT section before - the deletion of the row is one. After the row is deleted the number - of rows in the TFOOT section is zero. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tfoot"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="0" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml b/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml new file mode 100644 index 0000000..39896e1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement24"> +<metadata> +<title>HTMLTableSectionElement24</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a row from this section. + + Retrieve the first TBODY element and invoke the deleteRow() method + with an index of 0. The nuber of rows in the TBODY section before + the deletion of the row is two. After the row is deleted the number + of rows in the TBODY section is one. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail b/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail deleted file mode 100644 index 39896e1..0000000 --- a/test/testcases/tests/level1/html/HTMLTableSectionElement24.xml.kfail +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableSectionElement24"> -<metadata> -<title>HTMLTableSectionElement24</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a row from this section. - - Retrieve the first TBODY element and invoke the deleteRow() method - with an index of 0. The nuber of rows in the TBODY section before - the deletion of the row is two. After the row is deleted the number - of rows in the TBODY section is one. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5625626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tbody"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table06.xml b/test/testcases/tests/level1/html/table06.xml new file mode 100644 index 0000000..3d461f6 --- /dev/null +++ b/test/testcases/tests/level1/html/table06.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table06"> +<metadata> +<title>table06</title> +<creator>Netscape</creator> +<description> +Vertical alignment of data in cells. +The value of attribute valign of the tablesection element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="vvAlign" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> +<vAlign interface="HTMLTableSectionElement" obj="vsection" var="vvAlign"/> +<assertEquals actual="vvAlign" expected='"middle"' id="vAlignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table06.xml.kfail b/test/testcases/tests/level1/html/table06.xml.kfail deleted file mode 100644 index 3d461f6..0000000 --- a/test/testcases/tests/level1/html/table06.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table06"> -<metadata> -<title>table06</title> -<creator>Netscape</creator> -<description> -Vertical alignment of data in cells. -The value of attribute valign of the tablesection element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="vvAlign" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> -<vAlign interface="HTMLTableSectionElement" obj="vsection" var="vvAlign"/> -<assertEquals actual="vvAlign" expected='"middle"' id="vAlignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table07.xml b/test/testcases/tests/level1/html/table07.xml new file mode 100644 index 0000000..4a04d77 --- /dev/null +++ b/test/testcases/tests/level1/html/table07.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table07"> +<metadata> +<title>table07</title> +<creator>Netscape</creator> +<description> +The collection of rows in this table section. +The value of attribute rows of the tablesection element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="vcollection" type="HTMLCollection" /> +<var name="vrows" type="int" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> +<rows interface="HTMLTableSectionElement" obj="vsection" var="vcollection"/> +<length interface="HTMLCollection" obj="vcollection" var="vrows" /> +<assertEquals actual="vrows" expected="1" id="vrowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table07.xml.kfail b/test/testcases/tests/level1/html/table07.xml.kfail deleted file mode 100644 index 4a04d77..0000000 --- a/test/testcases/tests/level1/html/table07.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table07"> -<metadata> -<title>table07</title> -<creator>Netscape</creator> -<description> -The collection of rows in this table section. -The value of attribute rows of the tablesection element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="vcollection" type="HTMLCollection" /> -<var name="vrows" type="int" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> -<rows interface="HTMLTableSectionElement" obj="vsection" var="vcollection"/> -<length interface="HTMLCollection" obj="vcollection" var="vrows" /> -<assertEquals actual="vrows" expected="1" id="vrowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table15.xml b/test/testcases/tests/level1/html/table15.xml new file mode 100644 index 0000000..89455c3 --- /dev/null +++ b/test/testcases/tests/level1/html/table15.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table15"> +<metadata> +<title>table15</title> +<creator>Netscape</creator> +<description> +The collection of rows in this table section. +The value of attribute rows of the tablesection element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="vcollection" type="HTMLCollection" /> +<var name="vrows" type="int" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablesection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> +<rows interface="HTMLTableSectionElement" obj="vsection" var="vcollection"/> +<length interface="HTMLCollection" obj="vcollection" var="vrows" /> +<assertEquals actual="vrows" expected="1" id="vrowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table15.xml.kfail b/test/testcases/tests/level1/html/table15.xml.kfail deleted file mode 100644 index 89455c3..0000000 --- a/test/testcases/tests/level1/html/table15.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="table15"> -<metadata> -<title>table15</title> -<creator>Netscape</creator> -<description> -The collection of rows in this table section. -The value of attribute rows of the tablesection element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6419..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="vcollection" type="HTMLCollection" /> -<var name="vrows" type="int" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablesection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> -<rows interface="HTMLTableSectionElement" obj="vsection" var="vcollection"/> -<length interface="HTMLCollection" obj="vcollection" var="vrows" /> -<assertEquals actual="vrows" expected="1" id="vrowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement40.xml b/test/testcases/tests/level2/html/HTMLTableElement40.xml new file mode 100644 index 0000000..154b348 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableElement40.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableElement40"> +<metadata> +<title>HTMLTableElement40</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a table row. If the index is -1 + the last row of the table is deleted. + + Retrieve the second TABLE element and invoke the deleteRow() method + with an index of negative one. Currently there are four rows in the + table. The deleteRow() method is called and now there should be three. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""table""/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableElement" obj="testNode" index="-1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement40.xml.kfail b/test/testcases/tests/level2/html/HTMLTableElement40.xml.kfail deleted file mode 100644 index 154b348..0000000 --- a/test/testcases/tests/level2/html/HTMLTableElement40.xml.kfail +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableElement40"> -<metadata> -<title>HTMLTableElement40</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a table row. If the index is -1 - the last row of the table is deleted. - - Retrieve the second TABLE element and invoke the deleteRow() method - with an index of negative one. Currently there are four rows in the - table. The deleteRow() method is called and now there should be three. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""table""/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableElement" obj="testNode" index="-1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement20.xml b/test/testcases/tests/level2/html/HTMLTableRowElement20.xml new file mode 100644 index 0000000..a879e13 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableRowElement20.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableRowElement20"> +<metadata> +<title>HTMLTableRowElement20</title> +<creator>NIST</creator> +<description> + The insertCell() method inserts an empty TD cell into this row. + If index is -1 or equal to the number of cells, the new cell is + appended. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the last TD element. Invoke the + insertCell() with an index of negative one + which will append the empty cell to the end of the list. + Check the value of the newly created cell and make sure it is null + and also the numbers of cells should now be seven. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-07</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-68927016"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="newCell" type="HTMLElement"/> +<var name="vcells" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tr""/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected=""1230 North Ave. Dallas, Texas 98551"" id="value1Link" ignoreCase="false"/> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="-1"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<assertNull actual="cellNode" id="value2Link"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement20.xml.kfail b/test/testcases/tests/level2/html/HTMLTableRowElement20.xml.kfail deleted file mode 100644 index a879e13..0000000 --- a/test/testcases/tests/level2/html/HTMLTableRowElement20.xml.kfail +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableRowElement20"> -<metadata> -<title>HTMLTableRowElement20</title> -<creator>NIST</creator> -<description> - The insertCell() method inserts an empty TD cell into this row. - If index is -1 or equal to the number of cells, the new cell is - appended. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the last TD element. Invoke the - insertCell() with an index of negative one - which will append the empty cell to the end of the list. - Check the value of the newly created cell and make sure it is null - and also the numbers of cells should now be seven. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-07</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-68927016"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="newCell" type="HTMLElement"/> -<var name="vcells" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tr""/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected=""1230 North Ave. Dallas, Texas 98551"" id="value1Link" ignoreCase="false"/> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="-1"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<assertNull actual="cellNode" id="value2Link"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement21.xml b/test/testcases/tests/level2/html/HTMLTableRowElement21.xml new file mode 100644 index 0000000..9d5a598 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableRowElement21.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableRowElement21"> +<metadata> +<title>HTMLTableRowElement21</title> +<creator>NIST</creator> +<description> + The deleteCell() method deletes a cell from the currtent row. If + the index is -1 the last cell in the row is deleted. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the last TD element. Invoke the + deleteCell() with an index of negative one + which will delete the last cell in the row. + Check the value of the of the last cell + and also the numbers of cells should now be five. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-07</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-11738598"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="vcells" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tr""/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected=""1230 North Ave. Dallas, Texas 98551"" id="value1Link" ignoreCase="false"/> +<deleteCell interface="HTMLTableRowElement" obj="testNode" index="-1"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="4"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"Female"' id="value2Link" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement21.xml.kfail b/test/testcases/tests/level2/html/HTMLTableRowElement21.xml.kfail deleted file mode 100644 index 9d5a598..0000000 --- a/test/testcases/tests/level2/html/HTMLTableRowElement21.xml.kfail +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableRowElement21"> -<metadata> -<title>HTMLTableRowElement21</title> -<creator>NIST</creator> -<description> - The deleteCell() method deletes a cell from the currtent row. If - the index is -1 the last cell in the row is deleted. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the last TD element. Invoke the - deleteCell() with an index of negative one - which will delete the last cell in the row. - Check the value of the of the last cell - and also the numbers of cells should now be five. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-07</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-11738598"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="vcells" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tr""/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected=""1230 North Ave. Dallas, Texas 98551"" id="value1Link" ignoreCase="false"/> -<deleteCell interface="HTMLTableRowElement" obj="testNode" index="-1"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="4"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"Female"' id="value2Link" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml b/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml new file mode 100644 index 0000000..8fd17c2 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableSectionElement30"> +<metadata> +<title>HTMLTableSectionElement30</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. The new + row is inserted immediately before the current indexth row in this + section. If index is -1 or equal to the number of rows in this section, + the new row is appended. + + Retrieve the first THEAD element and invoke the insertRow() method + with an index of negative one. Since the index is negative one the + new row is appended. + After the new row is appended the number of rows in the THEAD + section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-07</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-93995626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""thead""/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="-1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml.kfail b/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml.kfail deleted file mode 100644 index 8fd17c2..0000000 --- a/test/testcases/tests/level2/html/HTMLTableSectionElement30.xml.kfail +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableSectionElement30"> -<metadata> -<title>HTMLTableSectionElement30</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. The new - row is inserted immediately before the current indexth row in this - section. If index is -1 or equal to the number of rows in this section, - the new row is appended. - - Retrieve the first THEAD element and invoke the insertRow() method - with an index of negative one. Since the index is negative one the - new row is appended. - After the new row is appended the number of rows in the THEAD - section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-07</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-93995626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""thead""/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableSectionElement" obj="testNode" var="newRow" index="-1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml b/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml new file mode 100644 index 0000000..55464e2 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableSectionElement31"> +<metadata> +<title>HTMLTableSectionElement31</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a row from this section. The index + starts from 0 and is relative only to the rows contained inside + this section, not all the rows in the table. If the index is -1 + the last row will be deleted. + + Retrieve the second TBODY element and invoke the deleteRow() method + with an index of -1. The nuber of rows in the THEAD section before + the deletion of the row is two. After the row is deleted the number + of rows in the TBODY section is one. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-11-07</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-5625626"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="tablesection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tbody""/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="-1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml.kfail b/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml.kfail deleted file mode 100644 index 55464e2..0000000 --- a/test/testcases/tests/level2/html/HTMLTableSectionElement31.xml.kfail +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLTableSectionElement31"> -<metadata> -<title>HTMLTableSectionElement31</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a row from this section. The index - starts from 0 and is relative only to the rows contained inside - this section, not all the rows in the table. If the index is -1 - the last row will be deleted. - - Retrieve the second TBODY element and invoke the deleteRow() method - with an index of -1. The nuber of rows in the THEAD section before - the deletion of the row is two. After the row is deleted the number - of rows in the TBODY section is one. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-11-07</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-5625626"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="tablesection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname=""tbody""/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableSectionElement" obj="testNode" index="-1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink2" ignoreCase="false"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=ab11dff6a1ff27c1afc8... commit ab11dff6a1ff27c1afc8a15bcfcc23470d64cc48 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> TEST generator bug fix diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 8953047..1ce2a99 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -728,7 +728,7 @@ sub generate_method { $method = to_cmethod($ats{'interface'}, $en); my $cast = to_attribute_cast($ats{'interface'}); my $get_attribute = $node->getAttribute("name"); - my $cast_get_attribute = to_get_attribute_cast($get_attribute); + my $cast_get_attribute = to_get_attribute_cast($get_attribute, $ats{'interface'}); my $ns = $dd->find("parameters/param", $node); my $params = "${cast}$ats{'obj'}"; for ($count = 1; $count <= $ns->size; $count++) { @@ -857,7 +857,7 @@ sub generate_attribute_fetcher { my $fetcher = to_attribute_fetcher($ats{'interface'}, "$en"); my $cast = to_attribute_cast($ats{'interface'}); my $get_attribute = $node->getAttribute("name"); - my $cast_get_attribute = to_get_attribute_cast($get_attribute); + my $cast_get_attribute = to_get_attribute_cast($get_attribute, $ats{'interface'}); my $unref = 0; my $temp_node = 0; # Deal with the situation like @@ -1476,7 +1476,8 @@ sub get_prefix { } sub to_get_attribute_cast { my $type = shift; - my $ret = get_get_attribute_prefix($type); + my $interface = shift; + my $ret = get_get_attribute_prefix($type, $interface); if($ret eq "") { return $ret; } @@ -1486,12 +1487,16 @@ sub to_get_attribute_cast { sub get_get_attribute_prefix { my $type = shift; - + my $interface = shift; if (exists $special_prefix{$type}) { $prefix = $special_prefix{$type}; } else { $prefix = ""; } +#eceptional case + if ($interfac eq "HTMLCollection" and $type eq "length") { + $prefix = "(uint32_t *)"; + } return $prefix; } # This function remain unsed commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=f9178b8cdfd99e96f753... commit f9178b8cdfd99e96f7535a2f473ce99e90274a6f Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> Missed inputElement Test files && bubbling and cancelability of generic events & buttonElement tests diff --git a/src/html/TODO b/src/html/TODO index e7d4853..183f10d 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -15,8 +15,8 @@ HTMLFormElement html_form_element DONE HTMLSelectElement html_select_element DONE HTMLOptGroupElement html_optgroup_element DONE HTMLOptionElement html_option_element DONE -HTMLInputElement html_input_element DONE -HTMLTextAreaElement html_textarea_element MISSING +HTMLInputElement html_input_element MISSING +HTMLTextAreaElement html_textarea_element DONE HTMLButtonElement html_button_element MISSING HTMLLabelElement html_label_element DONE HTMLFieldSetElement html_fieldset_element DONE diff --git a/src/html/html_anchor_element.c b/src/html/html_anchor_element.c index a215900..77f8cef 100644 --- a/src/html/html_anchor_element.c +++ b/src/html/html_anchor_element.c @@ -198,11 +198,11 @@ dom_exception dom_html_anchor_element_blur(dom_html_anchor_element *ele) bool success = false; assert(doc != NULL); - /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + /* This event does not bubble & is non-cancelable. Mentioned in w3 specs. More research is needed to prove why. */ return _dom_dispatch_generic_event((dom_document *) doc, (dom_event_target *) ele, - doc->memoised[hds_blur], true, - true, &success); + doc->memoised[hds_blur], false, + false, &success); } /** @@ -218,10 +218,10 @@ dom_exception dom_html_anchor_element_focus(dom_html_anchor_element *ele) bool success = false; assert(doc != NULL); - /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + /* This event does not bubble & is non-cancelable. Mentioned in w3 specs. More research is needed to prove why. */ return _dom_dispatch_generic_event((dom_document *)doc, (dom_event_target *) ele, - doc->memoised[hds_focus], true, - true, &success); + doc->memoised[hds_focus], false, + false, &success); } diff --git a/src/html/html_text_area_element.c b/src/html/html_text_area_element.c index eea5b4e..ac90a76 100644 --- a/src/html/html_text_area_element.c +++ b/src/html/html_text_area_element.c @@ -438,11 +438,11 @@ dom_exception dom_html_text_area_element_blur(dom_html_text_area_element *ele) bool success = false; assert(doc != NULL); - /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + /* This event does not bubble & is Non-cancellable. Mentioned in w3 specs. More research is needed to prove why. */ return _dom_dispatch_generic_event((dom_document *) doc, (dom_event_target *) ele, - doc->memoised[hds_blur], true, - true, &success); + doc->memoised[hds_blur], false, + false, &success); } /** @@ -458,11 +458,11 @@ dom_exception dom_html_text_area_element_focus(dom_html_text_area_element *ele) bool success = false; assert(doc != NULL); - /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + /* This event does not bubble & is Non-cancellable. Mentioned in w3 specs. More research is needed to prove why. */ return _dom_dispatch_generic_event((dom_document *)doc, (dom_event_target *) ele, - doc->memoised[hds_focus], true, - true, &success); + doc->memoised[hds_focus], false, + false, &success); } /** @@ -478,9 +478,9 @@ dom_exception dom_html_text_area_element_select(dom_html_text_area_element *ele) bool success = false; assert(doc != NULL); - /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + /* This event bubbles & is non-cancelable. Mentioned in w3 specs. More research is needed to prove why. */ return _dom_dispatch_generic_event((dom_document *)doc, (dom_event_target *) ele, doc->memoised[hds_select], true, - true, &success); + false, &success); } diff --git a/test/testcases/tests/level1/html/HTMLOptionElement05.xml b/test/testcases/tests/level1/html/HTMLOptionElement05.xml new file mode 100644 index 0000000..46812a1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLOptionElement05.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLOptionElement05"> +<metadata> +<title>HTMLOptionElement05</title> +<creator>NIST</creator> +<description> + The index attribute indicates th index of this OPTION in ints parent + SELECT. + + Retrieve the index attribute from the seventh OPTION element + and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1403..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vindex" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="option" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"option"'/> +<assertSize collection="nodeList" size="10" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="6"/> +<index interface="HTMLOptionElement" obj="testNode" var="vindex"/> +<assertEquals actual="vindex" expected="1" id="indexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/button01.xml b/test/testcases/tests/level1/html/button01.xml new file mode 100644 index 0000000..f128ea8 --- /dev/null +++ b/test/testcases/tests/level1/html/button01.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button01"> +<metadata> +<title>button01</title> +<creator>Netscape</creator> +<description> +Returns the FORM element containing this control. Returns null if this control is not within the context of a form. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-03-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7125..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vform" type="Node"/> +<var name="doc" type="Node"/> +<load var="doc" href="button" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<form interface="HTMLButtonElement" obj="testNode" var="vform"/> +<assertNull actual="vform" id="formLink"/> +</test> diff --git a/test/testcases/tests/level1/html/button01.xml.notimpl b/test/testcases/tests/level1/html/button01.xml.notimpl deleted file mode 100644 index f128ea8..0000000 --- a/test/testcases/tests/level1/html/button01.xml.notimpl +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button01"> -<metadata> -<title>button01</title> -<creator>Netscape</creator> -<description> -Returns the FORM element containing this control. Returns null if this control is not within the context of a form. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-03-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7125..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vform" type="Node"/> -<var name="doc" type="Node"/> -<load var="doc" href="button" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<form interface="HTMLButtonElement" obj="testNode" var="vform"/> -<assertNull actual="vform" id="formLink"/> -</test> diff --git a/test/testcases/tests/level1/html/button02.xml b/test/testcases/tests/level1/html/button02.xml new file mode 100644 index 0000000..bd072ef --- /dev/null +++ b/test/testcases/tests/level1/html/button02.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button02"> +<metadata> +<title>button02</title> +<creator>Netscape</creator> +<description> +The value of attribute name of the form element which contains this button is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-03-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7125..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6353..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="formNode" type="Node"/> +<var name="vfname" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="button" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<form interface="HTMLButtonElement" obj="testNode" var="formNode"/> +<id interface="HTMLElement" obj="formNode" var="vfname"/> +<assertEquals actual="vfname" expected='"form2"' id="formLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/button02.xml.notimpl b/test/testcases/tests/level1/html/button02.xml.notimpl deleted file mode 100644 index bd072ef..0000000 --- a/test/testcases/tests/level1/html/button02.xml.notimpl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button02"> -<metadata> -<title>button02</title> -<creator>Netscape</creator> -<description> -The value of attribute name of the form element which contains this button is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-03-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7125..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6353..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="formNode" type="Node"/> -<var name="vfname" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="button" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<form interface="HTMLButtonElement" obj="testNode" var="formNode"/> -<id interface="HTMLElement" obj="formNode" var="vfname"/> -<assertEquals actual="vfname" expected='"form2"' id="formLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/button03.xml b/test/testcases/tests/level1/html/button03.xml new file mode 100644 index 0000000..4074059 --- /dev/null +++ b/test/testcases/tests/level1/html/button03.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button03"> +<metadata> +<title>button03</title> +<creator>Netscape</creator> +<description> +The value of attribute action of the form element which contains this button is read and checked against the expected value +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-03-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7125..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7404..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="formNode" type="Node"/> +<var name="vfaction" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="button" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<form interface="HTMLButtonElement" obj="testNode" var="formNode"/> +<action interface="HTMLFormElement" obj="formNode" var="vfaction"/> +<assertEquals actual="vfaction" expected='"..."' id="formLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/button03.xml.notimpl b/test/testcases/tests/level1/html/button03.xml.notimpl deleted file mode 100644 index 4074059..0000000 --- a/test/testcases/tests/level1/html/button03.xml.notimpl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button03"> -<metadata> -<title>button03</title> -<creator>Netscape</creator> -<description> -The value of attribute action of the form element which contains this button is read and checked against the expected value -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-03-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7125..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7404..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="formNode" type="Node"/> -<var name="vfaction" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="button" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<form interface="HTMLButtonElement" obj="testNode" var="formNode"/> -<action interface="HTMLFormElement" obj="formNode" var="vfaction"/> -<assertEquals actual="vfaction" expected='"..."' id="formLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/button04.xml b/test/testcases/tests/level1/html/button04.xml new file mode 100644 index 0000000..737ddaa --- /dev/null +++ b/test/testcases/tests/level1/html/button04.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button04"> +<metadata> +<title>button04</title> +<creator>Netscape</creator> +<description> +The value of attribute method of the form element which contains this button is read and checked against the expected value +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-03-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7125..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8254..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="formNode" type="Node"/> +<var name="vfmethod" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="button" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<form interface="HTMLButtonElement" obj="testNode" var="formNode"/> +<method interface="HTMLFormElement" obj="formNode" var="vfmethod"/> +<assertEquals actual="vfmethod" expected='"POST"' id="formLink" ignoreCase="true"/> +</test> diff --git a/test/testcases/tests/level1/html/button04.xml.notimpl b/test/testcases/tests/level1/html/button04.xml.notimpl deleted file mode 100644 index 737ddaa..0000000 --- a/test/testcases/tests/level1/html/button04.xml.notimpl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button04"> -<metadata> -<title>button04</title> -<creator>Netscape</creator> -<description> -The value of attribute method of the form element which contains this button is read and checked against the expected value -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-03-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7125..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8254..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="formNode" type="Node"/> -<var name="vfmethod" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="button" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<form interface="HTMLButtonElement" obj="testNode" var="formNode"/> -<method interface="HTMLFormElement" obj="formNode" var="vfmethod"/> -<assertEquals actual="vfmethod" expected='"POST"' id="formLink" ignoreCase="true"/> -</test> diff --git a/test/testcases/tests/level1/html/button05.xml b/test/testcases/tests/level1/html/button05.xml new file mode 100644 index 0000000..ecff6b5 --- /dev/null +++ b/test/testcases/tests/level1/html/button05.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button05"> +<metadata> +<title>button05</title> +<creator>Netscape</creator> +<description> +A single character access key to give access to the form control. +The value of attribute accessKey of the button element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-03-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7316..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vakey" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="button" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<accessKey interface="HTMLButtonElement" obj="testNode" var="vakey"/> +<assertEquals actual="vakey" expected='"f"' id="accessKeyLink" ignoreCase="true"/> +</test> diff --git a/test/testcases/tests/level1/html/button05.xml.notimpl b/test/testcases/tests/level1/html/button05.xml.notimpl deleted file mode 100644 index ecff6b5..0000000 --- a/test/testcases/tests/level1/html/button05.xml.notimpl +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button05"> -<metadata> -<title>button05</title> -<creator>Netscape</creator> -<description> -A single character access key to give access to the form control. -The value of attribute accessKey of the button element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-03-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7316..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vakey" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="button" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<accessKey interface="HTMLButtonElement" obj="testNode" var="vakey"/> -<assertEquals actual="vakey" expected='"f"' id="accessKeyLink" ignoreCase="true"/> -</test> diff --git a/test/testcases/tests/level1/html/button06.xml b/test/testcases/tests/level1/html/button06.xml new file mode 100644 index 0000000..7a5e558 --- /dev/null +++ b/test/testcases/tests/level1/html/button06.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button06"> +<metadata> +<title>button06</title> +<creator>Netscape</creator> +<description> +Index that represents the element's position in the tabbing order. +The value of attribute tabIndex of the button element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-03-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3919..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vtabIndex" type="int" /> +<var name="doc" type="Node"/> +<load var="doc" href="button" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<tabIndex interface="HTMLButtonElement" obj="testNode" var="vtabIndex"/> +<assertEquals actual="vtabIndex" expected="20" id="tabIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/button06.xml.notimpl b/test/testcases/tests/level1/html/button06.xml.notimpl deleted file mode 100644 index 7a5e558..0000000 --- a/test/testcases/tests/level1/html/button06.xml.notimpl +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button06"> -<metadata> -<title>button06</title> -<creator>Netscape</creator> -<description> -Index that represents the element's position in the tabbing order. -The value of attribute tabIndex of the button element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-03-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3919..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vtabIndex" type="int" /> -<var name="doc" type="Node"/> -<load var="doc" href="button" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<tabIndex interface="HTMLButtonElement" obj="testNode" var="vtabIndex"/> -<assertEquals actual="vtabIndex" expected="20" id="tabIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/button07.xml b/test/testcases/tests/level1/html/button07.xml new file mode 100644 index 0000000..daddf76 --- /dev/null +++ b/test/testcases/tests/level1/html/button07.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button07"> +<metadata> +<title>button07</title> +<creator>Netscape</creator> +<description> +The type of button +The value of attribute type of the button element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-03-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2743..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vtype" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="button" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<type interface="HTMLButtonElement" obj="testNode" var="vtype"/> +<assertEquals actual="vtype" expected='"reset"' id="typeLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/button07.xml.notimpl b/test/testcases/tests/level1/html/button07.xml.notimpl deleted file mode 100644 index daddf76..0000000 --- a/test/testcases/tests/level1/html/button07.xml.notimpl +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button07"> -<metadata> -<title>button07</title> -<creator>Netscape</creator> -<description> -The type of button -The value of attribute type of the button element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-03-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2743..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vtype" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="button" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<type interface="HTMLButtonElement" obj="testNode" var="vtype"/> -<assertEquals actual="vtype" expected='"reset"' id="typeLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/button08.xml b/test/testcases/tests/level1/html/button08.xml new file mode 100644 index 0000000..a4dbb0b --- /dev/null +++ b/test/testcases/tests/level1/html/button08.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button08"> +<metadata> +<title>button08</title> +<creator>Netscape</creator> +<description> +The control is unavailable in this context. +The boolean value of attribute disabled of the button element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-03-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9275..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vdisabled" type="boolean" /> +<var name="doc" type="Node"/> +<load var="doc" href="button" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<disabled interface="HTMLButtonElement" obj="testNode" var="vdisabled"/> +<assertTrue actual="vdisabled" id="disabledLink"/> +</test> diff --git a/test/testcases/tests/level1/html/button08.xml.notimpl b/test/testcases/tests/level1/html/button08.xml.notimpl deleted file mode 100644 index a4dbb0b..0000000 --- a/test/testcases/tests/level1/html/button08.xml.notimpl +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button08"> -<metadata> -<title>button08</title> -<creator>Netscape</creator> -<description> -The control is unavailable in this context. -The boolean value of attribute disabled of the button element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-03-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9275..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vdisabled" type="boolean" /> -<var name="doc" type="Node"/> -<load var="doc" href="button" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<disabled interface="HTMLButtonElement" obj="testNode" var="vdisabled"/> -<assertTrue actual="vdisabled" id="disabledLink"/> -</test> diff --git a/test/testcases/tests/level1/html/button09.xml b/test/testcases/tests/level1/html/button09.xml new file mode 100644 index 0000000..d0efa94 --- /dev/null +++ b/test/testcases/tests/level1/html/button09.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button09"> +<metadata> +<title>button09</title> +<creator>Netscape</creator> +<description> +The current form control value. +The value of attribute value of the button element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-03-09</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7285..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vvalue" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="button" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<value interface="HTMLButtonElement" obj="testNode" var="vvalue"/> +<assertEquals actual="vvalue" expected='"Reset Disabled Button"' id="typeLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/button09.xml.notimpl b/test/testcases/tests/level1/html/button09.xml.notimpl deleted file mode 100644 index d0efa94..0000000 --- a/test/testcases/tests/level1/html/button09.xml.notimpl +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="button09"> -<metadata> -<title>button09</title> -<creator>Netscape</creator> -<description> -The current form control value. -The value of attribute value of the button element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-03-09</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7285..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vvalue" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="button" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"button"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<value interface="HTMLButtonElement" obj="testNode" var="vvalue"/> -<assertEquals actual="vvalue" expected='"Reset Disabled Button"' id="typeLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/files/input.html b/test/testcases/tests/level2/html/files/input.html new file mode 100644 index 0000000..c36e87d --- /dev/null +++ b/test/testcases/tests/level2/html/files/input.html @@ -0,0 +1,60 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML> +<HEAD> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8"> +<TITLE>NIST DOM HTML Test - INPUT</TITLE> +</HEAD> +<BODY onload="parent.loadComplete()"> +<TABLE CELLPADDING="15" BORDER="BORDER" SUMMARY="Table 1"> +<TR ALIGN="center"> +<TD VAlign="top">Under a FORM control +<FORM ID="form1" ACTION="./files/getData.pl" METHOD="post"> +<TABLE BORDER="15" SUMMARY="Table 2"> +<TR> +<TD> +<LABEL ACCESSKEY="b" FOR="input1">Enter Your Password:</LABEL> +</TD> +<TD> +<INPUT DIR="LTR" ID="input1" TABINDEX="8" VALUE="Password" TYPE="password" NAME="Password" SIZE="25" MAXLENGTH="5" ALT="Password entry" READONLY="READONLY"/> +</TD> +</TR> +<TR> +<TD> +<INPUT TYPE="RADIO" NAME="Radio1" ACCESSKEY="c" VALUE="ReHire"/>ReHire +</TD> +</TR> +<TR> +<TD> +<INPUT TYPE="RADIO" NAME="Radio2" VALUE="NewHire" TABINDEX="9" CHECKED="CHECKED"/>NewHire +</TD> +</TR> +<TR> +<TD>Hours available to work</TD> +<TD> +<INPUT TYPE="CHECKBOX" NAME="Check1" ALIGN="bottom" TABINDEX="10" VALUE="EarlyMornings" CHECKED="CHECKED"/>EarlyMornings +<BR/> +<INPUT ID="input5" TYPE="CHECKBOX" NAME="Check2" TABINDEX="11" VALUE="AfterNoon" ONCLICK="newId(this)"/>Afternoon +<BR/> +<INPUT TYPE="CHECKBOX" NAME="Check3" TABINDEX="12" VALUE="Evenings"/>Evenings +<BR/> +<INPUT TYPE="CHECKBOX" NAME="Check4" TABINDEX="13" VALUE="Closing" DISABLED="DISABLED"/>Closing +<BR/> +</TD> +</TR> +<TR> +<TD COLSPAN="2"> +<INPUT TYPE="IMAGE" TABINDEX="14" NAME="SubmitImage" USEMAP="#submit-map" SRC="./pix/submit.gif"/> +</TD> +</TR> +<TR> +<TD COLSPAN="2"> +<INPUT TITLE="old_title" TYPE="FILE" NAME="FileControl" TABINDEX="15" ACCEPT="GIF,JPEG" ONSELECT="newTitle(this)"/> +</TD> +</TR> +</TABLE> +</FORM> +</TD> +</TR> +</TABLE> +</BODY> +</HTML> diff --git a/test/testcases/tests/level2/html/files/input.xhtml b/test/testcases/tests/level2/html/files/input.xhtml new file mode 100644 index 0000000..b7704ad --- /dev/null +++ b/test/testcases/tests/level2/html/files/input.xhtml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - INPUT</title> +</head> +<body onload="parent.loadComplete()"> +<table cellpadding="15" border="border" summary="Table 1"> +<tr align="center"> +<td valign="top">Under a FORM control +<form id="form1" action="./files/getData.pl" method="post"> +<table border="15" summary="Table 2"> +<tr> +<td> +<label accesskey="b" for="input1">Enter Your Password:</label> +</td> +<td> +<input dir="ltr" id="input1" tabindex="8" value="Password" type="password" name="Password" size="25" maxlength="5" alt="Password entry" readonly="readonly"/> +</td> +</tr> +<tr> +<td> +<input type="radio" name="Radio1" accesskey="c" value="ReHire"/> +</td> +</tr> +<tr> +<td> +<input type="radio" name="Radio2" value="NewHire" tabindex="9" checked="checked"/> +</td> +</tr> +<tr> +<td>Hours available to work</td> +<td> +<input type="checkbox" name="Check1" align="bottom" tabindex="10" value="EarlyMornings" checked="checked"/> +<br/> +<input id="input5" type="checkbox" name="Check2" tabindex="11" value="AfterNoon" onclick="newId(this)"/> +<br/> +<input type="checkbox" name="Check3" tabindex="12" value="Evenings"/> +<br/> +<input type="checkbox" name="Check4" tabindex="13" value="Closing" disabled="disabled"/> +<br/> +</td> +</tr> +<tr> +<td colspan="2"> +<input type="image" tabindex="14" name="SubmitImage" usemap="#submit-map" src="./pix/submit.gif"/> +</td> +</tr> +<tr> +<td colspan="2"> +<input title="old_title" type="file" name="FileControl" tabindex="15" accept="GIF,JPEG" onselect="newTitle(this)"/> +</td> +</tr> +</table> +</form> +</td> +</tr> +</table> +</body> +</html> diff --git a/test/testcases/tests/level2/html/files/input.xml b/test/testcases/tests/level2/html/files/input.xml new file mode 100644 index 0000000..b7704ad --- /dev/null +++ b/test/testcases/tests/level2/html/files/input.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - INPUT</title> +</head> +<body onload="parent.loadComplete()"> +<table cellpadding="15" border="border" summary="Table 1"> +<tr align="center"> +<td valign="top">Under a FORM control +<form id="form1" action="./files/getData.pl" method="post"> +<table border="15" summary="Table 2"> +<tr> +<td> +<label accesskey="b" for="input1">Enter Your Password:</label> +</td> +<td> +<input dir="ltr" id="input1" tabindex="8" value="Password" type="password" name="Password" size="25" maxlength="5" alt="Password entry" readonly="readonly"/> +</td> +</tr> +<tr> +<td> +<input type="radio" name="Radio1" accesskey="c" value="ReHire"/> +</td> +</tr> +<tr> +<td> +<input type="radio" name="Radio2" value="NewHire" tabindex="9" checked="checked"/> +</td> +</tr> +<tr> +<td>Hours available to work</td> +<td> +<input type="checkbox" name="Check1" align="bottom" tabindex="10" value="EarlyMornings" checked="checked"/> +<br/> +<input id="input5" type="checkbox" name="Check2" tabindex="11" value="AfterNoon" onclick="newId(this)"/> +<br/> +<input type="checkbox" name="Check3" tabindex="12" value="Evenings"/> +<br/> +<input type="checkbox" name="Check4" tabindex="13" value="Closing" disabled="disabled"/> +<br/> +</td> +</tr> +<tr> +<td colspan="2"> +<input type="image" tabindex="14" name="SubmitImage" usemap="#submit-map" src="./pix/submit.gif"/> +</td> +</tr> +<tr> +<td colspan="2"> +<input title="old_title" type="file" name="FileControl" tabindex="15" accept="GIF,JPEG" onselect="newTitle(this)"/> +</td> +</tr> +</table> +</form> +</td> +</tr> +</table> +</body> +</html> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=6997e7a6e476bfd3a630... commit 6997e7a6e476bfd3a630a8bbbea3a99f8a0aaef6 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> changing size attribute of Input Element to be of type int diff --git a/include/dom/html/html_input_element.h b/include/dom/html/html_input_element.h index eb6aecd..086e1cb 100644 --- a/include/dom/html/html_input_element.h +++ b/include/dom/html/html_input_element.h @@ -85,10 +85,10 @@ dom_exception dom_html_input_element_set_read_only( dom_html_input_element *input, bool read_only); dom_exception dom_html_input_element_get_size( - dom_html_input_element *input, dom_string **size); + dom_html_input_element *input, int32_t *size); dom_exception dom_html_input_element_set_size( - dom_html_input_element *input, dom_string *size); + dom_html_input_element *input, uint32_t size); dom_exception dom_html_input_element_get_src( dom_html_input_element *input, dom_string **src); diff --git a/src/html/TODO b/src/html/TODO index 6a3d190..e7d4853 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -15,7 +15,7 @@ HTMLFormElement html_form_element DONE HTMLSelectElement html_select_element DONE HTMLOptGroupElement html_optgroup_element DONE HTMLOptionElement html_option_element DONE -HTMLInputElement html_input_element MISSING +HTMLInputElement html_input_element DONE HTMLTextAreaElement html_textarea_element MISSING HTMLButtonElement html_button_element MISSING HTMLLabelElement html_label_element DONE diff --git a/src/html/html_input_element.c b/src/html/html_input_element.c index bab79f2..c4cfc05 100644 --- a/src/html/html_input_element.c +++ b/src/html/html_input_element.c @@ -349,12 +349,24 @@ SIMPLE_GET_SET(access_key); SIMPLE_GET_SET(align); SIMPLE_GET_SET(alt); SIMPLE_GET_SET(name); -SIMPLE_GET_SET(size); SIMPLE_GET_SET(src); SIMPLE_GET(type); SIMPLE_GET_SET(use_map); SIMPLE_GET_SET(value); +dom_exception dom_html_input_element_get_size( + dom_html_input_element *input, int32_t *size) +{ + return dom_html_element_get_int32_t_property(&input->base, "size", + SLEN("size"), size); +} + +dom_exception dom_html_input_element_set_size( + dom_html_input_element *input, uint32_t size) +{ + return dom_html_element_set_int32_t_property(&input->base, "size", + SLEN("size"), size); +} dom_exception dom_html_input_element_get_tab_index( dom_html_input_element *input, int32_t *tab_index) { diff --git a/test/testcases/tests/level2/html/HTMLInputElement13.xml b/test/testcases/tests/level2/html/HTMLInputElement13.xml new file mode 100644 index 0000000..e243035 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLInputElement13.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLInputElement13"> +<metadata> +<title>HTMLInputElement13</title> +<creator>NIST</creator> +<description> + The size attribute contains the size information. Its precise meaning + is specific to each type of field. + + Retrieve the size attribute of the 1st INPUT element and examine + its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2001-12-26</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-79659438"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsize" type="int"/> +<var name="doc" type="Node"/> +<load var="doc" href="input" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"input"'/> +<assertSize collection="nodeList" size="9" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<size interface="HTMLInputElement" obj="testNode" var="vsize"/> +<assertEquals actual="vsize" expected="25" id="size" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLInputElement13.xml.kfail b/test/testcases/tests/level2/html/HTMLInputElement13.xml.kfail deleted file mode 100644 index e243035..0000000 --- a/test/testcases/tests/level2/html/HTMLInputElement13.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLInputElement13"> -<metadata> -<title>HTMLInputElement13</title> -<creator>NIST</creator> -<description> - The size attribute contains the size information. Its precise meaning - is specific to each type of field. - - Retrieve the size attribute of the 1st INPUT element and examine - its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2001-12-26</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-79659438"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsize" type="int"/> -<var name="doc" type="Node"/> -<load var="doc" href="input" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"input"'/> -<assertSize collection="nodeList" size="9" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<size interface="HTMLInputElement" obj="testNode" var="vsize"/> -<assertEquals actual="vsize" expected="25" id="size" ignoreCase="false"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=d2cac62f6899c3d46dde... commit d2cac62f6899c3d46dde5ec5a36f82e593e21d9c Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> OptionElement diff --git a/include/dom/html/html_option_element.h b/include/dom/html/html_option_element.h index 53ba286..aa0d11c 100644 --- a/include/dom/html/html_option_element.h +++ b/include/dom/html/html_option_element.h @@ -28,7 +28,7 @@ dom_exception dom_html_option_element_get_text( dom_html_option_element *option, dom_string **text); dom_exception dom_html_option_element_get_index( - dom_html_option_element *option, unsigned long *index); + dom_html_option_element *option, int32_t *index); dom_exception dom_html_option_element_get_disabled( dom_html_option_element *option, bool *disabled); diff --git a/src/html/TODO b/src/html/TODO index 8e004e1..6a3d190 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -13,8 +13,8 @@ HTMLStyleElement html_style_element DONE HTMLBodyElement html_body_element MISSING HTMLFormElement html_form_element DONE HTMLSelectElement html_select_element DONE -HTMLOptGroupElement html_optgroup_element MISSING -HTMLOptionElement html_option_element MISSING +HTMLOptGroupElement html_optgroup_element DONE +HTMLOptionElement html_option_element DONE HTMLInputElement html_input_element MISSING HTMLTextAreaElement html_textarea_element MISSING HTMLButtonElement html_button_element MISSING diff --git a/src/html/html_option_element.c b/src/html/html_option_element.c index b133deb..b777c5f 100644 --- a/src/html/html_option_element.c +++ b/src/html/html_option_element.c @@ -255,13 +255,22 @@ dom_exception dom_html_option_element_get_text( * \return DOM_NO_ERR on success, appropriate error otherwise. */ dom_exception dom_html_option_element_get_index( - dom_html_option_element *option, unsigned long *index) + dom_html_option_element *option, int32_t *index) { - UNUSED(option); - UNUSED(index); + dom_html_document *doc = (dom_html_document *) dom_node_get_owner(option); + int32_t idx = 0; + dom_node_internal *n = ((dom_node_internal *)option)->parent; - /** \todo Implement */ - return DOM_NOT_SUPPORTED_ERR; + for(n = n->first_child;n != NULL; n = n->next) { + if((dom_node_internal *)option == n) { + *index = idx; + break; + } else if(dom_string_caseless_isequal(n->name,doc->memoised[hds_OPTION])) { + idx += 1; + } + } + + return DOM_NO_ERR; } /** diff --git a/test/testcases/tests/level1/html/HTMLOptionElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLOptionElement05.xml.kfail deleted file mode 100644 index 46812a1..0000000 --- a/test/testcases/tests/level1/html/HTMLOptionElement05.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLOptionElement05"> -<metadata> -<title>HTMLOptionElement05</title> -<creator>NIST</creator> -<description> - The index attribute indicates th index of this OPTION in ints parent - SELECT. - - Retrieve the index attribute from the seventh OPTION element - and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1403..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vindex" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="option" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"option"'/> -<assertSize collection="nodeList" size="10" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="6"/> -<index interface="HTMLOptionElement" obj="testNode" var="vindex"/> -<assertEquals actual="vindex" expected="1" id="indexLink" ignoreCase="false"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=47c4541c38fd3d21cc13... commit 47c4541c38fd3d21cc13d3a7dfe28cba219e5671 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> Xselect element && disabling IsIndex Element diff --git a/src/html/Makefile b/src/html/Makefile index 8c20362..2cb85d9 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -3,7 +3,7 @@ DIR_SOURCES := \ html_document.c html_collection.c html_options_collection.c \ html_element.c html_html_element.c html_head_element.c \ html_link_element.c html_title_element.c html_meta_element.c \ - html_base_element.c html_isindex_element.c html_style_element.c \ + html_base_element.c html_style_element.c \ html_body_element.c html_form_element.c html_select_element.c \ html_button_element.c html_input_element.c html_text_area_element.c \ html_opt_group_element.c html_option_element.c html_hr_element.c \ @@ -20,7 +20,7 @@ DIR_SOURCES := \ html_table_element.c html_tablerow_element.c UNINMPLEMENTED_SOURCES := \ - html_frameset_element.c \ + html_frameset_element.c html_isindex_element.c \ html_frame_element.c html_iframe_element.c include $(NSBUILD)/Makefile.subdir diff --git a/src/html/TODO b/src/html/TODO index d817e68..8e004e1 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -12,7 +12,7 @@ HTMLIsIndexElement html_isindex_element MISSING HTMLStyleElement html_style_element DONE HTMLBodyElement html_body_element MISSING HTMLFormElement html_form_element DONE -HTMLSelectElement html_select_element MISSING +HTMLSelectElement html_select_element DONE HTMLOptGroupElement html_optgroup_element MISSING HTMLOptionElement html_option_element MISSING HTMLInputElement html_input_element MISSING diff --git a/src/html/html_select_element.c b/src/html/html_select_element.c index 1e49c75..7a5e84e 100644 --- a/src/html/html_select_element.c +++ b/src/html/html_select_element.c @@ -65,8 +65,8 @@ dom_exception _dom_html_select_element_initialise(struct dom_html_document *doc, ele->form = NULL; return _dom_html_element_initialise(doc, &ele->base, - doc->memoised[hds_SELECT], - namespace, prefix); + doc->memoised[hds_SELECT], + namespace, prefix); } /** @@ -125,16 +125,16 @@ dom_exception _dom_html_select_element_copy(dom_node_internal *old, /* Public APIs */ static dom_exception _dom_html_select_element_make_collection( - dom_html_select_element *ele, - dom_html_options_collection **col) + dom_html_select_element *ele, + dom_html_options_collection **col) { dom_html_document *doc = (dom_html_document *) dom_node_get_owner(ele); assert(doc != NULL); return _dom_html_options_collection_create(doc, - (dom_node_internal *) ele, - is_option, ele, col); + (dom_node_internal *) ele, + is_option, ele, col); } /** @@ -178,7 +178,7 @@ dom_exception dom_html_select_element_get_selected_index( dom_node *option; bool selected; dom_html_options_collection *col; - + err = _dom_html_select_element_make_collection(ele, &col); err = dom_html_options_collection_get_length(col, &len); @@ -194,7 +194,7 @@ dom_exception dom_html_select_element_get_selected_index( dom_html_options_collection_unref(col); return err; } - + err = dom_html_option_element_get_selected( (dom_html_option_element *) option, &selected); @@ -204,7 +204,7 @@ dom_exception dom_html_select_element_get_selected_index( dom_html_options_collection_unref(col); return err; } - + if (selected) { *index = idx; dom_html_options_collection_unref(col); @@ -228,11 +228,30 @@ dom_exception dom_html_select_element_get_selected_index( dom_exception dom_html_select_element_set_selected_index( dom_html_select_element *ele, int32_t index) { - UNUSED(ele); - UNUSED(index); + dom_exception err; + dom_node *option; + dom_html_options_collection *col; - /** \todo Implement */ - return DOM_NOT_SUPPORTED_ERR; + err = _dom_html_select_element_make_collection(ele, &col); + + err = dom_html_options_collection_item(col, + index, &option); + if (err != DOM_NO_ERR) { + dom_html_options_collection_unref(col); + return err; + } + + err = dom_html_option_element_set_selected( + (dom_html_option_element *) option, true); + + dom_node_unref(option); + + dom_html_options_collection_unref(col); + if (err != DOM_NO_ERR) { + return err; + } + + return DOM_NO_ERR; } /** @@ -250,7 +269,7 @@ dom_exception dom_html_select_element_get_value( dom_node *option; bool selected; dom_html_options_collection *col; - + err = _dom_html_select_element_make_collection(ele, &col); if (err != DOM_NO_ERR) return err; @@ -291,7 +310,7 @@ dom_exception dom_html_select_element_get_value( *value = NULL; dom_html_options_collection_unref(col); - + return DOM_NO_ERR; } @@ -305,11 +324,54 @@ dom_exception dom_html_select_element_get_value( dom_exception dom_html_select_element_set_value( dom_html_select_element *ele, dom_string *value) { - UNUSED(ele); - UNUSED(value); + dom_exception err; + uint32_t idx, len; + dom_node *option; + bool selected; + dom_html_options_collection *col; + + err = _dom_html_select_element_make_collection(ele, &col); + if (err != DOM_NO_ERR) + return err; + + err = dom_html_select_element_get_length(ele, &len); + if (err != DOM_NO_ERR) { + dom_html_options_collection_unref(col); + return err; + } + + for (idx = 0; idx < len; idx++) { + err = dom_html_options_collection_item(col, + idx, &option); + if (err != DOM_NO_ERR) { + dom_html_options_collection_unref(col); + return err; + } + + err = dom_html_option_element_get_selected( + (dom_html_option_element *) option, &selected); + if (err != DOM_NO_ERR) { + dom_html_options_collection_unref(col); + dom_node_unref(option); + return err; + } + + if (selected) { + err = dom_html_option_element_set_value( + (dom_html_option_element *) option, + value); + + dom_html_options_collection_unref(col); + dom_node_unref(option); + + return err; + } + } + + dom_html_options_collection_unref(col); + + return DOM_NO_ERR; - /** \todo Implement */ - return DOM_NOT_SUPPORTED_ERR; } /** @@ -362,7 +424,7 @@ dom_exception dom_html_select_element_set_length( * \return DOM_NO_ERR on success, appropriate error otherwise. */ dom_exception dom_html_select_element_get_form( - dom_html_select_element *select, dom_html_form_element **form) + dom_html_select_element *select, dom_html_form_element **form) { *form = select->form; @@ -536,12 +598,12 @@ dom_exception dom_html_select_element_set_tab_index( dom_exception dom__html_select_element_add(dom_html_select_element *select, struct dom_html_element *ele, struct dom_html_element *before) { - UNUSED(select); - UNUSED(ele); - UNUSED(before); - /** \todo Implement */ - return DOM_NOT_SUPPORTED_ERR; + return _dom_node_insert_before((dom_node_internal *)select, + (dom_node_internal *)ele, (dom_node_internal *)before, + (dom_node_internal **)&ele); + + } dom_exception dom_html_select_element_remove(dom_html_select_element *ele, @@ -549,17 +611,31 @@ dom_exception dom_html_select_element_remove(dom_html_select_element *ele, { dom_exception err; uint32_t len; + dom_node *option; err = dom_html_select_element_get_length(ele, &len); if (err != DOM_NO_ERR) return err; /* Ensure index is in range */ - if (index < 0 || (uint32_t)index >= len) + if (index < 0 || index >= (int32_t)len) return DOM_NO_ERR; + dom_html_options_collection *col; - /** \todo What does remove mean? Remove option from tree and destroy it? */ - return DOM_NOT_SUPPORTED_ERR; + err = _dom_html_select_element_make_collection(ele, &col); + if (err != DOM_NO_ERR) + return err; + + err = dom_html_options_collection_item(col, + index, &option); + + if (err != DOM_NO_ERR) { + dom_html_options_collection_unref(col); + return err; + } + return _dom_node_remove_child(((dom_node_internal *)option)->parent, + (dom_node_internal *)option, + (dom_node_internal **)&option); } /** @@ -577,9 +653,9 @@ dom_exception dom_html_select_element_blur(struct dom_html_select_element *ele) /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ return _dom_dispatch_generic_event((dom_document *) doc, - (dom_event_target *) ele, - doc->memoised[hds_blur], true, - true, &success); + (dom_event_target *) ele, + doc->memoised[hds_blur], true, + true, &success); } /** @@ -597,9 +673,9 @@ dom_exception dom_html_select_element_focus(struct dom_html_select_element *ele) /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ return _dom_dispatch_generic_event((dom_document *) doc, - (dom_event_target *) ele, - doc->memoised[hds_focus], true, - true, &success); + (dom_event_target *) ele, + doc->memoised[hds_focus], true, + true, &success); } @@ -611,7 +687,7 @@ bool is_option(struct dom_node_internal *node, void *ctx) { dom_html_select_element *ele = ctx; dom_html_document *doc = (dom_html_document *) dom_node_get_owner(ele); - + if (dom_string_isequal(node->name, doc->memoised[hds_OPTION])) return true; @@ -619,7 +695,7 @@ bool is_option(struct dom_node_internal *node, void *ctx) } dom_exception _dom_html_select_element_set_form( - dom_html_select_element *select, dom_html_form_element *form) + dom_html_select_element *select, dom_html_form_element *form) { select->form = form; diff --git a/src/html/html_style_element.c b/src/html/html_style_element.c index 3b295f1..681f0b8 100644 --- a/src/html/html_style_element.c +++ b/src/html/html_style_element.c @@ -35,7 +35,7 @@ dom_exception _dom_html_style_element_create(struct dom_html_document *doc, *ele = malloc(sizeof(dom_html_style_element)); if (*ele == NULL) return DOM_NO_MEM_ERR; - + /* Set up vtables */ node = (struct dom_node_internal *) *ele; node->base.vtable = &_dom_html_element_vtable; diff --git a/test/testcases/tests/level1/html/HTMLSelectElement17.xml.int-broken b/test/testcases/tests/level1/html/HTMLSelectElement17.xml.int-broken deleted file mode 100644 index 03549ff..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement17.xml.int-broken +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement17"> -<metadata> -<title>HTMLSelectElement17</title> -<creator>Curt Arnold</creator> -<description> -Removes a non-existant option using HTMLSelectElement.remove. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<remove interface="HTMLSelectElement" obj="testNode" index="6"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="5" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail new file mode 100644 index 0000000..03549ff --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement17"> +<metadata> +<title>HTMLSelectElement17</title> +<creator>Curt Arnold</creator> +<description> +Removes a non-existant option using HTMLSelectElement.remove. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<remove interface="HTMLSelectElement" obj="testNode" index="6"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="5" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail index 2d2a732..5d06fe1 100644 --- a/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail @@ -33,7 +33,7 @@ Add a new option before the selected node using HTMLSelectElement.add. <var name="selected" type="int"/> <var name="newOpt" type="Element"/> <var name="newOptText" type="Text"/> -<var name="opt" type="Element"/> +<var name="opt" type="Node"/> <var name="optText" type="Text"/> <var name="optValue" type="DOMString"/> <var name="retNode" type="Node"/> diff --git a/test/testcases/tests/level2/html/HTMLSelectElement20.xml b/test/testcases/tests/level2/html/HTMLSelectElement20.xml new file mode 100644 index 0000000..ddbe2f7 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLSelectElement20.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLSelectElement20"> +<metadata> +<title>HTMLSelectElement20</title> +<creator>Curt Arnold</creator> +<description> +Attempting to add an new option using HTMLSelectElement.add before a node that is not a child of the select +element should raise a NOT_FOUND_ERR. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-14493106"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<var name="newOpt" type="Element"/> +<var name="newOptText" type="Text"/> +<var name="retNode" type="Node"/> +<var name="options" type="HTMLCollection"/> +<var name="otherSelect" type="Element"/> +<var name="selectedNode" type="Node"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<item interface="NodeList" obj="nodeList" var="otherSelect" index="1"/> +<createElement var="newOpt" obj="doc" tagName='"option"'/> +<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> +<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> +<options var="options" obj="otherSelect"/> +<item var="selectedNode" obj="options" index="0" interface="HTMLCollection"/> +<assertDOMException id="throw_NOT_FOUND_ERR"> + <NOT_FOUND_ERR> + <add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="selectedNode"/> + </NOT_FOUND_ERR> +</assertDOMException> +</test> diff --git a/test/testcases/tests/level2/html/HTMLSelectElement20.xml.kfail b/test/testcases/tests/level2/html/HTMLSelectElement20.xml.kfail deleted file mode 100644 index ddbe2f7..0000000 --- a/test/testcases/tests/level2/html/HTMLSelectElement20.xml.kfail +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLSelectElement20"> -<metadata> -<title>HTMLSelectElement20</title> -<creator>Curt Arnold</creator> -<description> -Attempting to add an new option using HTMLSelectElement.add before a node that is not a child of the select -element should raise a NOT_FOUND_ERR. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-14493106"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<var name="newOpt" type="Element"/> -<var name="newOptText" type="Text"/> -<var name="retNode" type="Node"/> -<var name="options" type="HTMLCollection"/> -<var name="otherSelect" type="Element"/> -<var name="selectedNode" type="Node"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<item interface="NodeList" obj="nodeList" var="otherSelect" index="1"/> -<createElement var="newOpt" obj="doc" tagName='"option"'/> -<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> -<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> -<options var="options" obj="otherSelect"/> -<item var="selectedNode" obj="options" index="0" interface="HTMLCollection"/> -<assertDOMException id="throw_NOT_FOUND_ERR"> - <NOT_FOUND_ERR> - <add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="selectedNode"/> - </NOT_FOUND_ERR> -</assertDOMException> -</test> diff --git a/test/testcases/tests/level2/html/files/select.html b/test/testcases/tests/level2/html/files/select.html new file mode 100644 index 0000000..7820624 --- /dev/null +++ b/test/testcases/tests/level2/html/files/select.html @@ -0,0 +1,44 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML> +<HEAD> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8"> +<TITLE>NIST DOM HTML Test - SELECT</TITLE> +</HEAD> +<BODY onload="parent.loadComplete()"> +<FORM ID="form1" ACTION="./files/getData.pl" METHOD="post"> +<P> +<SELECT ID="selectId" DIR="ltr" TABINDEX="7" NAME="select1" MULTIPLE="multiple" SIZE="1"> +<OPTION SELECTED="selected" value="EMP1">EMP10001</OPTION> +<OPTION>EMP10002</OPTION> +<OPTION>EMP10003</OPTION> +<OPTION>EMP10004</OPTION> +<OPTION>EMP10005</OPTION> +</SELECT> +</P> +</FORM> +<P> +<SELECT NAME="select2"> +<OPTION>EMP20001</OPTION> +<OPTION>EMP20002</OPTION> +<OPTION>EMP20003</OPTION> +<OPTION>EMP20004</OPTION> +<OPTION>EMP20005</OPTION> +</SELECT> +</P> +<P> +<SELECT NAME="select3" DISABLED="disabled" TABINDEX="1"> +<OPTION>EMP30001</OPTION> +<OPTION>EMP30002</OPTION> +<OPTION>EMP30003</OPTION> +<OPTION>EMP30004</OPTION> +<OPTION>EMP30005</OPTION> +</SELECT> +</P> +</BODY> +</HTML> + + + + + + diff --git a/test/testcases/tests/level2/html/files/select.xhtml b/test/testcases/tests/level2/html/files/select.xhtml new file mode 100644 index 0000000..491a74c --- /dev/null +++ b/test/testcases/tests/level2/html/files/select.xhtml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - SELECT</title> +</head> +<body onload="parent.loadComplete()"> +<form id="form1" action="./files/getData.pl" method="post"> +<p> +<select id="selectId" dir="ltr" tabindex="7" name="select1" multiple="multiple" size="1"> +<option selected="selected" value="EMP1">EMP10001</option> +<option>EMP10002</option> +<option>EMP10003</option> +<option>EMP10004</option> +<option>EMP10005</option> +</select> +</p> +</form> +<p> +<select name="select2"> +<option>EMP20001</option> +<option>EMP20002</option> +<option>EMP20003</option> +<option>EMP20004</option> +<option>EMP20005</option> +</select> +</p> +<p> +<select name="select3" disabled="disabled" tabindex="1"> +<option>EMP30001</option> +<option>EMP30002</option> +<option>EMP30003</option> +<option>EMP30004</option> +<option>EMP30005</option> +</select> +</p> +</body> +</html> + diff --git a/test/testcases/tests/level2/html/files/select.xml b/test/testcases/tests/level2/html/files/select.xml new file mode 100644 index 0000000..491a74c --- /dev/null +++ b/test/testcases/tests/level2/html/files/select.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - SELECT</title> +</head> +<body onload="parent.loadComplete()"> +<form id="form1" action="./files/getData.pl" method="post"> +<p> +<select id="selectId" dir="ltr" tabindex="7" name="select1" multiple="multiple" size="1"> +<option selected="selected" value="EMP1">EMP10001</option> +<option>EMP10002</option> +<option>EMP10003</option> +<option>EMP10004</option> +<option>EMP10005</option> +</select> +</p> +</form> +<p> +<select name="select2"> +<option>EMP20001</option> +<option>EMP20002</option> +<option>EMP20003</option> +<option>EMP20004</option> +<option>EMP20005</option> +</select> +</p> +<p> +<select name="select3" disabled="disabled" tabindex="1"> +<option>EMP30001</option> +<option>EMP30002</option> +<option>EMP30003</option> +<option>EMP30004</option> +<option>EMP30005</option> +</select> +</p> +</body> +</html> + commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=cddc5afe1d6c11e1f292... commit cddc5afe1d6c11e1f29231f96d98e8731ec80987 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> Style Element diff --git a/Makefile b/Makefile index adb8d59..9b47c36 100644 --- a/Makefile +++ b/Makefile @@ -129,6 +129,8 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablecol_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablesection_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_table_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablerow_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_base_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_style_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 2c312f4..68ae227 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -89,6 +89,7 @@ #include <dom/html/html_table_element.h> #include <dom/html/html_tablerow_element.h> #include <dom/html/html_base_element.h> +#include <dom/html/html_style_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_isindex_element.h b/include/dom/html/html_isindex_element.h index 4961ccc..966b2d2 100644 --- a/include/dom/html/html_isindex_element.h +++ b/include/dom/html/html_isindex_element.h @@ -22,5 +22,10 @@ typedef struct dom_html_isindex_element dom_html_isindex_element; dom_exception dom_html_isindex_element_get_form(dom_html_isindex_element *ele, struct dom_html_form_element **form); +dom_exception dom_html_isindex_element_get_prompt(dom_html_isindex_element *ele, + dom_string **prompt); + +dom_exception dom_html_isindex_element_set_prompt(dom_html_isindex_element *ele, + dom_string *prompt); #endif diff --git a/include/dom/html/html_style_element.h b/include/dom/html/html_style_element.h index 868a043..5b3cd41 100644 --- a/include/dom/html/html_style_element.h +++ b/include/dom/html/html_style_element.h @@ -10,6 +10,7 @@ #include <stdbool.h> #include <dom/core/exceptions.h> +#include <dom/core/string.h> typedef struct dom_html_style_element dom_html_style_element; @@ -19,5 +20,17 @@ dom_exception dom_html_style_element_get_disabled(dom_html_style_element *ele, dom_exception dom_html_style_element_set_disabled(dom_html_style_element *ele, bool disabled); +dom_exception dom_html_style_element_get_media(dom_html_style_element *ele, + dom_string **media); + +dom_exception dom_html_style_element_set_media(dom_html_style_element *ele, + dom_string *media); + +dom_exception dom_html_style_element_get_type(dom_html_style_element *ele, + dom_string **type); + +dom_exception dom_html_style_element_set_type(dom_html_style_element *ele, + dom_string *type); + #endif diff --git a/src/html/TODO b/src/html/TODO index 97eab8e..d817e68 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -9,7 +9,7 @@ HTMLTitleElement html_title_element DONE HTMLMetaElement html_meta_element DONE HTMLBaseElement html_base_element DONE HTMLIsIndexElement html_isindex_element MISSING -HTMLStyleElement html_style_element MISSING +HTMLStyleElement html_style_element DONE HTMLBodyElement html_body_element MISSING HTMLFormElement html_form_element DONE HTMLSelectElement html_select_element MISSING diff --git a/src/html/html_document.c b/src/html/html_document.c index 25abca3..0e39f77 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -56,6 +56,7 @@ #include "html/html_tablesection_element.h" #include "html/html_table_element.h" #include "html/html_tablerow_element.h" +#include "html/html_style_element.h" #include "core/attr.h" #include "core/string.h" @@ -361,6 +362,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_TD])) { exc = _dom_html_table_row_element_create(html, namespace, prefix, (dom_html_table_row_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_STYLE])) { + exc = _dom_html_style_element_create(html, + (dom_html_style_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 8ded892..5d5ddaf 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -105,6 +105,7 @@ HTML_DOCUMENT_STRINGS_ACTION1(scope) HTML_DOCUMENT_STRINGS_ACTION1(frame) HTML_DOCUMENT_STRINGS_ACTION1(rules) HTML_DOCUMENT_STRINGS_ACTION1(summary) +HTML_DOCUMENT_STRINGS_ACTION1(prompt) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) diff --git a/src/html/html_style_element.c b/src/html/html_style_element.c index 98eb79b..3b295f1 100644 --- a/src/html/html_style_element.c +++ b/src/html/html_style_element.c @@ -8,6 +8,7 @@ #include <stdlib.h> #include "html/html_style_element.h" +#include "html/html_document.h" #include "core/node.h" #include "utils/utils.h" @@ -54,13 +55,20 @@ dom_exception _dom_html_style_element_initialise(struct dom_html_document *doc, struct dom_html_style_element *ele) { dom_string *name = NULL; + dom_string *media_default = NULL; dom_exception err; err = dom_string_create((const uint8_t *) "STYLE", SLEN("STYLE"), &name); if (err != DOM_NO_ERR) return err; + + err = dom_string_create((const uint8_t *) "screen", SLEN("screen"), + &media_default); + if (err != DOM_NO_ERR) + return err; + ele->media = media_default; err = _dom_html_element_initialise(doc, &ele->base, name, NULL, NULL); dom_string_unref(name); @@ -119,9 +127,49 @@ dom_exception _dom_html_style_element_copy(dom_node_internal *old, return _dom_html_element_copy(old, copy); } + /*-----------------------------------------------------------------------*/ /* Public APIs */ +#define SIMPLE_GET(attr) \ + dom_exception dom_html_style_element_get_##attr( \ + dom_html_style_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_style_element_set_##attr( \ + dom_html_style_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) +SIMPLE_GET_SET(type); +SIMPLE_SET(media); + /** * Get the disabled property * @@ -150,3 +198,36 @@ dom_exception dom_html_style_element_set_disabled(dom_html_style_element *ele, SLEN("disabled"), disabled); } +/** + * Get the media property + * + * \param ele The dom_html_style_element object + * \param media The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_style_element_get_media(dom_html_style_element *ele, + dom_string **media) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_media], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_media], media); + } + + *media = ele->media; + if (*media != NULL) + dom_string_ref(*media); + return DOM_NO_ERR; + +} + diff --git a/src/html/html_style_element.h b/src/html/html_style_element.h index e7a47e5..285da94 100644 --- a/src/html/html_style_element.h +++ b/src/html/html_style_element.h @@ -15,6 +15,8 @@ struct dom_html_style_element { struct dom_html_element base; /**< The base class */ + dom_string *media; + /**< The default string value for the media attribute*/ }; /* Create a dom_html_style_element object */ diff --git a/test/testcases/tests/level1/html/HTMLBaseElement01.xml b/test/testcases/tests/level1/html/HTMLBaseElement01.xml new file mode 100644 index 0000000..fa6eacc --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLBaseElement01.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLBaseElement01"> +<metadata> +<title>HTMLBaseElement01</title> +<creator>NIST</creator> +<description> + The href attribute specifies the base URI. + + Retrieve the href attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6538..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vhref" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="base" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"base"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<href interface="HTMLBaseElement" obj="testNode" var="vhref"/> +<assertEquals actual="vhref" expected='"about:blank"' id="hrefLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLBaseElement02.xml b/test/testcases/tests/level1/html/HTMLBaseElement02.xml new file mode 100644 index 0000000..d2a20a5 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLBaseElement02.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLBaseElement02"> +<metadata> +<title>HTMLBaseElement02</title> +<creator>NIST</creator> +<description> + The target attribute specifies the default target frame. + + Retrieve the target attribute and examine its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-07-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7384..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vtarget" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="base2" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"base"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<target interface="HTMLBaseElement" obj="testNode" var="vtarget"/> +<assertEquals actual="vtarget" expected='"Frame1"' id="targetLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLStyleElement01.xml b/test/testcases/tests/level1/html/HTMLStyleElement01.xml new file mode 100644 index 0000000..60c2e57 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLStyleElement01.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLStyleElement01"> +<metadata> +<title>HTMLStyleElement01</title> +<creator>NIST</creator> +<description> + The disabled attribute enables/disables the stylesheet. + + Retrieve the disabled attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5116..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vdisabled" type="boolean" /> +<var name="doc" type="Document"/> +<load var="doc" href="style" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"style"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<disabled interface="HTMLStyleElement" obj="testNode" var="vdisabled"/> +<assertFalse actual="vdisabled" id="disabledLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLStyleElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLStyleElement01.xml.kfail deleted file mode 100644 index 60c2e57..0000000 --- a/test/testcases/tests/level1/html/HTMLStyleElement01.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLStyleElement01"> -<metadata> -<title>HTMLStyleElement01</title> -<creator>NIST</creator> -<description> - The disabled attribute enables/disables the stylesheet. - - Retrieve the disabled attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5116..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vdisabled" type="boolean" /> -<var name="doc" type="Document"/> -<load var="doc" href="style" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"style"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<disabled interface="HTMLStyleElement" obj="testNode" var="vdisabled"/> -<assertFalse actual="vdisabled" id="disabledLink"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLStyleElement02.xml b/test/testcases/tests/level1/html/HTMLStyleElement02.xml new file mode 100644 index 0000000..727df54 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLStyleElement02.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLStyleElement02"> +<metadata> +<title>HTMLStyleElement02</title> +<creator>NIST</creator> +<description> + The media attribute identifies the intended medium of the style info. + + Retrieve the media attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7641..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vmedia" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="style" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"style"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<media interface="HTMLStyleElement" obj="testNode" var="vmedia"/> +<assertEquals actual="vmedia" expected='"screen"' id="mediaLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLStyleElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLStyleElement02.xml.kfail deleted file mode 100644 index 727df54..0000000 --- a/test/testcases/tests/level1/html/HTMLStyleElement02.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLStyleElement02"> -<metadata> -<title>HTMLStyleElement02</title> -<creator>NIST</creator> -<description> - The media attribute identifies the intended medium of the style info. - - Retrieve the media attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7641..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vmedia" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="style" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"style"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<media interface="HTMLStyleElement" obj="testNode" var="vmedia"/> -<assertEquals actual="vmedia" expected='"screen"' id="mediaLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLStyleElement03.xml b/test/testcases/tests/level1/html/HTMLStyleElement03.xml new file mode 100644 index 0000000..54394e3 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLStyleElement03.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLStyleElement03"> +<metadata> +<title>HTMLStyleElement03</title> +<creator>NIST</creator> +<description> + The type attribute specifies the style sheet language(Internet media type). + + Retrieve the type attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2247..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vtype" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="style" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"style"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<type interface="HTMLStyleElement" obj="testNode" var="vtype"/> +<assertEquals actual="vtype" expected='"text/css"' id="typeLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLStyleElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLStyleElement03.xml.kfail deleted file mode 100644 index 54394e3..0000000 --- a/test/testcases/tests/level1/html/HTMLStyleElement03.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLStyleElement03"> -<metadata> -<title>HTMLStyleElement03</title> -<creator>NIST</creator> -<description> - The type attribute specifies the style sheet language(Internet media type). - - Retrieve the type attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2247..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vtype" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="style" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"style"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<type interface="HTMLStyleElement" obj="testNode" var="vtype"/> -<assertEquals actual="vtype" expected='"text/css"' id="typeLink" ignoreCase="false"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=c749ad0e5f04cd8a34f0... commit c749ad0e5f04cd8a34f06f0aa6511396b9c8af34 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> Base Element diff --git a/include/dom/dom.h b/include/dom/dom.h index fb39388..2c312f4 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -88,6 +88,7 @@ #include <dom/html/html_tablesection_element.h> #include <dom/html/html_table_element.h> #include <dom/html/html_tablerow_element.h> +#include <dom/html/html_base_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_base_element.h b/include/dom/html/html_base_element.h index 5ff28ee..c8283f3 100644 --- a/include/dom/html/html_base_element.h +++ b/include/dom/html/html_base_element.h @@ -8,7 +8,23 @@ #ifndef dom_html_base_element_h_ #define dom_html_base_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + typedef struct dom_html_base_element dom_html_base_element; +dom_exception dom_html_base_element_get_href( + dom_html_base_element *element, dom_string **href); + +dom_exception dom_html_base_element_set_href( + dom_html_base_element *element, dom_string *href); + +dom_exception dom_html_base_element_get_target( + dom_html_base_element *element, dom_string **target); + +dom_exception dom_html_base_element_set_target( + dom_html_base_element *element, dom_string *target); + #endif diff --git a/src/html/TODO b/src/html/TODO index 0a75535..97eab8e 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -4,10 +4,10 @@ as far as the test suite is concerned. HTMLElement html_element DONE HTMLHtmlElement html_html_element DONE HTMLHeadElement html_head_element DONE -HTMLLinkElement html_link_element MISSING +HTMLLinkElement html_link_element DONE HTMLTitleElement html_title_element DONE -HTMLMetaElement html_meta_element MISSING -HTMLBaseElement html_base_element MISSING +HTMLMetaElement html_meta_element DONE +HTMLBaseElement html_base_element DONE HTMLIsIndexElement html_isindex_element MISSING HTMLStyleElement html_style_element MISSING HTMLBodyElement html_body_element MISSING diff --git a/src/html/html_base_element.c b/src/html/html_base_element.c index 150ef37..6be8e3a 100644 --- a/src/html/html_base_element.c +++ b/src/html/html_base_element.c @@ -7,6 +7,7 @@ #include <stdlib.h> +#include "html/html_document.h" #include "html/html_base_element.h" #include "core/node.h" @@ -118,3 +119,45 @@ dom_exception _dom_html_base_element_copy(dom_node_internal *old, return _dom_html_element_copy(old, copy); } +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_base_element_get_##attr( \ + dom_html_base_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_base_element_set_##attr( \ + dom_html_base_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_GET_SET(href); +SIMPLE_GET_SET(target); diff --git a/test/testcases/tests/level1/html/HTMLBaseElement01.xml.notimpl b/test/testcases/tests/level1/html/HTMLBaseElement01.xml.notimpl deleted file mode 100644 index fa6eacc..0000000 --- a/test/testcases/tests/level1/html/HTMLBaseElement01.xml.notimpl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLBaseElement01"> -<metadata> -<title>HTMLBaseElement01</title> -<creator>NIST</creator> -<description> - The href attribute specifies the base URI. - - Retrieve the href attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6538..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vhref" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="base" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"base"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<href interface="HTMLBaseElement" obj="testNode" var="vhref"/> -<assertEquals actual="vhref" expected='"about:blank"' id="hrefLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLBaseElement02.xml.notimpl b/test/testcases/tests/level1/html/HTMLBaseElement02.xml.notimpl deleted file mode 100644 index d2a20a5..0000000 --- a/test/testcases/tests/level1/html/HTMLBaseElement02.xml.notimpl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLBaseElement02"> -<metadata> -<title>HTMLBaseElement02</title> -<creator>NIST</creator> -<description> - The target attribute specifies the default target frame. - - Retrieve the target attribute and examine its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-07-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7384..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vtarget" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="base2" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"base"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<target interface="HTMLBaseElement" obj="testNode" var="vtarget"/> -<assertEquals actual="vtarget" expected='"Frame1"' id="targetLink" ignoreCase="false"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=84b829ca717840101d5e... commit 84b829ca717840101d5ee3cfe401797d52399da2 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> tableSectionElement Rev.2 && tableCellElement Rev.4 && tableElement Rev.1 && tableRowElement Rev.1 && DOMTSHandler(Test Suite) Revised and implemented inefficient ways to produce correct .c's && other minor bg fixes in HTMLCollection... Tests expecting 2nd attribute of dom_html_collection_get_length to be of type int32_t aren't enabled yet. Will be done in a later commit. diff --git a/Makefile b/Makefile index 0745e10..adb8d59 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,8 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablecaption_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablecell_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablecol_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablesection_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_table_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablerow_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 071ca2c..fb39388 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -86,6 +86,8 @@ #include <dom/html/html_tablecell_element.h> #include <dom/html/html_tablecol_element.h> #include <dom/html/html_tablesection_element.h> +#include <dom/html/html_table_element.h> +#include <dom/html/html_tablerow_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_table_element.h b/include/dom/html/html_table_element.h index 2e182d5..6fcd7ed 100644 --- a/include/dom/html/html_table_element.h +++ b/include/dom/html/html_table_element.h @@ -3,5 +3,128 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_table_element_h_ +#define dom_html_table_element_h_ + +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +#include<dom/html/html_element.h> +#include<dom/html/html_tablecaption_element.h> +#include<dom/html/html_tablesection_element.h> +#include<dom/html/html_tablerow_element.h> + +typedef struct dom_html_table_element dom_html_table_element; + +dom_exception dom_html_table_element_get_caption( + dom_html_table_element *element, dom_html_table_caption_element **caption); + +dom_exception dom_html_table_element_set_caption( + dom_html_table_element *element, dom_html_table_caption_element *caption); + +dom_exception dom_html_table_element_get_t_head( + dom_html_table_element *element, dom_html_table_section_element **t_head); + +dom_exception dom_html_table_element_set_t_head( + dom_html_table_element *element, dom_html_table_section_element *t_head); + +dom_exception dom_html_table_element_get_t_foot( + dom_html_table_element *element, dom_html_table_section_element **t_foot); + +dom_exception dom_html_table_element_set_t_foot( + dom_html_table_element *element, dom_html_table_section_element *t_foot); + +dom_exception dom_html_table_element_get_rows( + dom_html_table_element *element, dom_html_collection **rows); + +dom_exception dom_html_table_element_get_t_bodies( + dom_html_table_element *element, dom_html_collection **t_bodies); + +dom_exception dom_html_table_element_get_align( + dom_html_table_element *table, dom_string **align); + +dom_exception dom_html_table_element_set_align( + dom_html_table_element *table, dom_string *align); + +dom_exception dom_html_table_element_get_bg_color( + dom_html_table_element *table, dom_string **bg_color); + +dom_exception dom_html_table_element_set_bg_color( + dom_html_table_element *table, dom_string *bg_color); + +dom_exception dom_html_table_element_get_border( + dom_html_table_element *table, dom_string **border); + +dom_exception dom_html_table_element_set_border( + dom_html_table_element *table, dom_string *border); + +dom_exception dom_html_table_element_get_cell_padding( + dom_html_table_element *table, dom_string **cell_padding); + +dom_exception dom_html_table_element_set_cell_padding( + dom_html_table_element *table, dom_string *cell_padding); + +dom_exception dom_html_table_element_get_cell_spacing( + dom_html_table_element *table, dom_string **cell_spacing); + +dom_exception dom_html_table_element_set_cell_spacing( + dom_html_table_element *table, dom_string *cell_spacing); + +dom_exception dom_html_table_element_get_frame( + dom_html_table_element *table, dom_string **frame); + +dom_exception dom_html_table_element_set_frame( + dom_html_table_element *table, dom_string *frame); + +dom_exception dom_html_table_element_get_rules( + dom_html_table_element *table, dom_string **rules); + +dom_exception dom_html_table_element_set_rules( + dom_html_table_element *table, dom_string *rules); + +dom_exception dom_html_table_element_get_summary( + dom_html_table_element *table, dom_string **summary); + +dom_exception dom_html_table_element_set_summary( + dom_html_table_element *table, dom_string *summary); + +dom_exception dom_html_table_element_get_width( + dom_html_table_element *table, dom_string **width); + +dom_exception dom_html_table_element_set_width( + dom_html_table_element *table, dom_string *width); + +dom_exception dom_html_table_element_create_caption( + dom_html_table_element *element, + dom_html_element **caption); + +dom_exception dom_html_table_element_delete_caption( + dom_html_table_element *element); + +dom_exception dom_html_table_element_create_t_head( + dom_html_table_element *element, + dom_html_element **t_head); + +dom_exception dom_html_table_element_delete_t_head( + dom_html_table_element *element); + +dom_exception dom_html_table_element_create_t_foot( + dom_html_table_element *element, + dom_html_element **t_foot); + +dom_exception dom_html_table_element_delete_t_foot( + dom_html_table_element *element); + +dom_exception dom_html_table_element_insert_row( + dom_html_table_element *element, + int32_t index, dom_html_element **row); + +dom_exception dom_html_table_element_delete_row( + dom_html_table_element *element, + int32_t index); + +#endif diff --git a/include/dom/html/html_tablerow_element.h b/include/dom/html/html_tablerow_element.h index 2e182d5..897e243 100644 --- a/include/dom/html/html_tablerow_element.h +++ b/include/dom/html/html_tablerow_element.h @@ -3,5 +3,67 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_table_row_element_h_ +#define dom_html_table_row_element_h_ + +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +#include<dom/html/html_element.h> +#include<dom/html/html_collection.h> + +typedef struct dom_html_table_row_element dom_html_table_row_element; + +dom_exception dom_html_table_row_element_get_align( + dom_html_table_row_element *table, dom_string **align); + +dom_exception dom_html_table_row_element_set_align( + dom_html_table_row_element *table, dom_string *align); + +dom_exception dom_html_table_row_element_get_bg_color( + dom_html_table_row_element *table, dom_string **bg_color); + +dom_exception dom_html_table_row_element_set_bg_color( + dom_html_table_row_element *table, dom_string *bg_color); + +dom_exception dom_html_table_row_element_get_ch( + dom_html_table_row_element *table, dom_string **ch); + +dom_exception dom_html_table_row_element_set_ch( + dom_html_table_row_element *table, dom_string *ch); + +dom_exception dom_html_table_row_element_get_ch_off( + dom_html_table_row_element *table, dom_string **ch_off); + +dom_exception dom_html_table_row_element_set_ch_off( + dom_html_table_row_element *table, dom_string *ch_off); + +dom_exception dom_html_table_row_element_get_v_align( + dom_html_table_row_element *table, dom_string **v_align); + +dom_exception dom_html_table_row_element_set_v_align( + dom_html_table_row_element *table, dom_string *v_align); + +dom_exception dom_html_table_row_element_get_row_index( + dom_html_table_row_element *table, int32_t *index); + +dom_exception dom_html_table_row_element_get_section_row_index( + dom_html_table_row_element *table_row, int32_t *section_row_index); + +dom_exception dom_html_table_row_element_get_cells( + dom_html_table_row_element *element, + dom_html_collection **cells); + +dom_exception dom_html_table_row_element_delete_cell( + dom_html_table_row_element *element, + int32_t index); + +dom_exception dom_html_table_row_element_insert_cell( + dom_html_table_row_element *element, + int32_t index, dom_html_element **cell); + +#endif diff --git a/include/dom/html/html_tablesection_element.h b/include/dom/html/html_tablesection_element.h index e3b0065..bceec18 100644 --- a/include/dom/html/html_tablesection_element.h +++ b/include/dom/html/html_tablesection_element.h @@ -16,6 +16,8 @@ #include <dom/html/html_collection.h> #include <dom/html/html_element.h> +#include <dom/html/html_tablerow_element.h> + typedef struct dom_html_table_section_element dom_html_table_section_element; dom_exception dom_html_table_section_element_get_align( @@ -47,7 +49,7 @@ dom_exception dom_html_table_section_element_get_rows( dom_exception dom_html_table_section_element_insert_row( dom_html_table_section_element *element, - int32_t index, dom_html_element **newRow); + int32_t index, dom_html_element **new_row); dom_exception dom_html_table_section_element_delete_row( dom_html_table_section_element *element, diff --git a/src/html/Makefile b/src/html/Makefile index 8fc029d..8c20362 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -16,11 +16,11 @@ DIR_SOURCES := \ html_basefont_element.c html_image_element.c html_object_element.c \ html_param_element.c html_applet_element.c html_area_element.c \ html_map_element.c html_script_element.c html_tablecaption_element.c \ - html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c + html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ + html_table_element.c html_tablerow_element.c UNINMPLEMENTED_SOURCES := \ - html_table_element.c \ - html_tablerow_element.c html_frameset_element.c \ + html_frameset_element.c \ html_frame_element.c html_iframe_element.c include $(NSBUILD)/Makefile.subdir diff --git a/src/html/TODO b/src/html/TODO index 50e905c..0a75535 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -46,11 +46,11 @@ HTMLAppletElement html_applet_element DONE HTMLMapElement html_map_element DONE HTMLAreaElement html_area_element DONE HTMLScriptElement html_script_element DONE -HTMLTableElement html_table_element MISSING +HTMLTableElement html_table_element DONE HTMLTableCaptionElement html_tablecaption_element DONE HTMLTableColElement html_tablecol_element DONE HTMLTableSectionElement html_tablesection_element DONE -HTMLTableRowElement html_tablerow_element MISSING +HTMLTableRowElement html_tablerow_element DONE HTMLTableCellElement html_tablecell_element DONE HTMLFrameSetElement html_frameset_element MISSING HTMLFrameElement html_frame_element MISSING diff --git a/src/html/html_collection.c b/src/html/html_collection.c index fb801d9..2b4d8aa 100644 --- a/src/html/html_collection.c +++ b/src/html/html_collection.c @@ -132,7 +132,7 @@ dom_exception dom_html_collection_get_length(dom_html_collection *col, /* No children and siblings */ struct dom_node_internal *parent = node->parent; - while (parent != col->root && + while (node != col->root && node == parent->last_child) { node = parent; parent = parent->parent; diff --git a/src/html/html_document.c b/src/html/html_document.c index 692dd98..25abca3 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -54,6 +54,8 @@ #include "html/html_tablecell_element.h" #include "html/html_tablecol_element.h" #include "html/html_tablesection_element.h" +#include "html/html_table_element.h" +#include "html/html_tablerow_element.h" #include "core/attr.h" #include "core/string.h" @@ -350,9 +352,15 @@ _dom_html_document_create_element_internal(dom_html_document *html, (dom_html_table_col_element **) result); } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_THEAD])|| dom_string_caseless_isequal(tag_name, html->memoised[hds_TBODY])|| - dom_string_caseless_isequal(tag_name, html->memoised[hds_TBODY])) { + dom_string_caseless_isequal(tag_name, html->memoised[hds_TFOOT])) { exc = _dom_html_table_section_element_create(html, tag_name, namespace, prefix, (dom_html_table_section_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_TABLE])) { + exc = _dom_html_table_element_create(html, namespace, prefix, + (dom_html_table_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_TD])) { + exc = _dom_html_table_row_element_create(html, namespace, prefix, + (dom_html_table_row_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 38b0004..8ded892 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -102,6 +102,9 @@ HTML_DOCUMENT_STRINGS_ACTION1(abbr) HTML_DOCUMENT_STRINGS_ACTION1(axis) HTML_DOCUMENT_STRINGS_ACTION1(headers) HTML_DOCUMENT_STRINGS_ACTION1(scope) +HTML_DOCUMENT_STRINGS_ACTION1(frame) +HTML_DOCUMENT_STRINGS_ACTION1(rules) +HTML_DOCUMENT_STRINGS_ACTION1(summary) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) @@ -112,6 +115,8 @@ HTML_DOCUMENT_STRINGS_ACTION(value_type,valuetype) HTML_DOCUMENT_STRINGS_ACTION(v_align,valign) HTML_DOCUMENT_STRINGS_ACTION(ch,char) HTML_DOCUMENT_STRINGS_ACTION(ch_off,charoff) +HTML_DOCUMENT_STRINGS_ACTION(cell_padding,cellpadding) +HTML_DOCUMENT_STRINGS_ACTION(cell_spacing,cellspacing) /* HTML_DOCUMENT_STRINGS_ACTION1(type) */ HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap) /* HTML_DOCUMENT_STRINGS_ACTION1(value) */ diff --git a/src/html/html_table_element.c b/src/html/html_table_element.c index 2e182d5..0f27fd3 100644 --- a/src/html/html_table_element.c +++ b/src/html/html_table_element.c @@ -3,5 +3,745 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> + +#include <dom/html/html_table_element.h> + +#include "html/html_document.h" +#include "html/html_table_element.h" +#include "html/html_tablecaption_element.h" +#include "html/html_tablesection_element.h" +#include "html/html_tablerow_element.h" +#include "html/html_collection.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_TABLE_ELEMENT + }, + DOM_HTML_TABLE_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_table_element object + * + * \param doc The document object + * \param ele The returned element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_table_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_table_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_table_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_table_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_table_element object + * + * \param doc The document object + * \param ele The dom_html_table_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_table_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_table_element *ele) +{ + ele->caption = NULL; + ele->t_head = NULL; + ele->t_foot = NULL; + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_TABLE], + namespace, prefix); +} + +/** + * Finalise a dom_html_table_element object + * + * \param ele The dom_html_table_element object + */ +void _dom_html_table_element_finalise(struct dom_html_table_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_table_element object + * + * \param ele The dom_html_table_element object + */ +void _dom_html_table_element_destroy(struct dom_html_table_element *ele) +{ + _dom_html_table_element_finalise(ele); + free(ele); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_table_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_table_element_destroy(dom_node_internal *node) +{ + _dom_html_table_element_destroy((struct dom_html_table_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_table_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_table_element_get_##attr( \ + dom_html_table_element *element, \ + dom_string **attr) \ +{ \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)-> \ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ +} +#define SIMPLE_SET(attr) \ + dom_exception dom_html_table_element_set_##attr( \ + dom_html_table_element *element, \ + dom_string *attr) \ +{ \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)-> \ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ +} + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) +SIMPLE_GET_SET(align); +SIMPLE_GET_SET(bg_color); +SIMPLE_GET_SET(border); +SIMPLE_GET_SET(cell_padding); +SIMPLE_GET_SET(cell_spacing); +SIMPLE_GET_SET(frame); +SIMPLE_GET_SET(rules); +SIMPLE_GET_SET(summary); +SIMPLE_GET_SET(width); + +/** + * Get the caption Attribute + * + * \param table The dom_html_table_element object + */ +dom_exception dom_html_table_element_get_caption( + dom_html_table_element *table, dom_html_table_caption_element **caption) +{ + dom_node_internal *node_tmp = ((dom_node_internal *)table); + dom_html_document *doc = (dom_html_document *)(node_tmp->owner); + + if(table->caption == NULL) { + for (node_tmp = node_tmp->first_child; node_tmp != NULL; node_tmp = node_tmp->next) { + if((node_tmp->type == DOM_ELEMENT_NODE) && + dom_string_caseless_isequal(doc->memoised[hds_CAPTION],node_tmp->name)) { + break; + } + } + table->caption = (dom_html_table_caption_element *)node_tmp; + } + *caption = (table->caption); + return DOM_NO_ERR; +} + +/** + * Set the caption Attribute + * + * \param table The dom_html_table_element object + * \param table The dom_html_table_element object + */ +dom_exception dom_html_table_element_set_caption( + dom_html_table_element *table, dom_html_table_caption_element *caption) +{ + dom_node_internal *check_node = ((dom_node_internal *)caption); + dom_html_document *doc = (dom_html_document *)(((dom_node_internal *)table)->owner); + if(check_node == NULL) { + return DOM_HIERARCHY_REQUEST_ERR; + } + if(!dom_string_caseless_isequal(doc->memoised[hds_CAPTION],check_node->name)) { + return DOM_HIERARCHY_REQUEST_ERR; + } + table->caption = caption; + return DOM_NO_ERR; +} + +/** + * Get the t_head Attribute + * + * \param table The dom_html_table_element object + */ +dom_exception dom_html_table_element_get_t_head( + dom_html_table_element *table, dom_html_table_section_element **t_head) +{ + dom_node_internal *node_tmp = ((dom_node_internal *)table); + dom_html_document *doc = (dom_html_document *)(node_tmp->owner); + + if(table->t_head == NULL) { + for (node_tmp = node_tmp->first_child; node_tmp != NULL; node_tmp = node_tmp->next) { + if((node_tmp->type == DOM_ELEMENT_NODE) && + dom_string_caseless_isequal(doc->memoised[hds_THEAD],node_tmp->name)) { + break; + } + } + table->t_head = (dom_html_table_section_element *)node_tmp; + } + *t_head = table->t_head; + return DOM_NO_ERR; +} + +/** + * Set the t_head Attribute + * + * \param table The dom_html_table_element object + * \param table The dom_html_table_element object + */ +dom_exception dom_html_table_element_set_t_head( + dom_html_table_element *table, dom_html_table_section_element *t_head) +{ + dom_node_internal *check_node = ((dom_node_internal *)t_head); + dom_html_document *doc = (dom_html_document *)(((dom_node_internal *)table)->owner); + if(check_node == NULL) { + return DOM_HIERARCHY_REQUEST_ERR; + } + if(!dom_string_caseless_isequal(doc->memoised[hds_CAPTION],check_node->name)) { + return DOM_HIERARCHY_REQUEST_ERR; + } + table->t_head = t_head; + return DOM_NO_ERR; +} + +/** + * Get the t_foot Attribute + * + * \param table The dom_html_table_element object + */ +dom_exception dom_html_table_element_get_t_foot( + dom_html_table_element *table, dom_html_table_section_element **t_foot) +{ + dom_node_internal *node_tmp = ((dom_node_internal *)table); + dom_html_document *doc = (dom_html_document *)(node_tmp->owner); + + if(table->t_foot == NULL) { + for (node_tmp = node_tmp->first_child; node_tmp != NULL; node_tmp = node_tmp->next) { + if((node_tmp->type == DOM_ELEMENT_NODE) && + dom_string_caseless_isequal(doc->memoised[hds_TFOOT],node_tmp->name)) { + break; + } + } + table->t_foot = (dom_html_table_section_element *)node_tmp; + } + *t_foot = (table->t_foot); + return DOM_NO_ERR; +} + +/** + * Set the t_foot Attribute + * + * \param table The dom_html_table_element object + */ +dom_exception dom_html_table_element_set_t_foot( + dom_html_table_element *table, dom_html_table_section_element *t_foot) +{ + dom_node_internal *check_node = ((dom_node_internal *)t_foot); /*< temporary node to check for raised exceptions */ + dom_html_document *doc = (dom_html_document *)(((dom_node_internal *)table)->owner); + if(check_node == NULL) { + return DOM_HIERARCHY_REQUEST_ERR; + } + if(!dom_string_caseless_isequal(doc->memoised[hds_TFOOT],check_node->name)) { + return DOM_HIERARCHY_REQUEST_ERR; + } + table->t_foot = t_foot; + return DOM_NO_ERR; +} + +/** + * Callback for creating the rows collection + * + * \param node The dom_html_table_element object + * \param ctx The dom_html_document object (void *) + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +bool table_rows_callback(struct dom_node_internal *node, void *ctx) +{ + if(node->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_TR])) { + return true; + } + return false; +} + +/** + * Get the rows collection + * + * \param element The dom_html_table_element object + * \param rows The Status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_get_rows( + dom_html_table_element *element, + dom_html_collection **rows) +{ + dom_html_document *doc = (dom_html_document *) ((dom_node_internal *) element)->owner; + return _dom_html_collection_create(doc, (dom_node_internal *)element, + table_rows_callback, (void *)doc, rows); +} + +/** + * Callback for creating the tbodies collection + * + * \param node The dom_html_table_element object + * \param ctx The dom_html_document object (void *) + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +bool table_t_bodies_callback(struct dom_node_internal *node, void *ctx) +{ + if(node->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_TBODY])) { + return true; + } + return false; +} + +/** + * Get the tBodies collection + * + * \param element The dom_html_table_element object + * \param t_bodies The Status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_get_t_bodies( + dom_html_table_element *element, + dom_html_collection **t_bodies) +{ + dom_html_document *doc = (dom_html_document *) ((dom_node_internal *) element)->owner; + return _dom_html_collection_create(doc, (dom_node_internal *)element, + table_t_bodies_callback, (void *)doc, t_bodies); +} + +/** + * Get or Create the table caption + * + * \param element The dom_html_table_element object + * \param caption The Status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_create_caption( + dom_html_table_element *element, + dom_html_element **caption) +{ + dom_exception exp; + if((exp = dom_html_table_element_get_caption(element, + (dom_html_table_caption_element **)caption)) != DOM_NO_ERR) { + return exp; + } + if((*caption) == NULL) { + dom_html_document *doc = (dom_html_document *) + ((dom_node_internal *) element)->owner; + exp = _dom_html_table_caption_element_create(doc, + ((dom_node_internal *)element)->namespace, + ((dom_node_internal *)element)->prefix, + (dom_html_table_caption_element **)caption); + if(exp != DOM_NO_ERR) { + return exp; + } + _dom_node_append_child((dom_node_internal *)element, + (dom_node_internal *)*caption, + (dom_node_internal **)caption); + element->caption = (dom_html_table_caption_element *)*caption; + + } + return DOM_NO_ERR; +} + +/** + * Delete the table caption, if one exists + * + * \param element The dom_html_table_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_delete_caption( + dom_html_table_element *element) +{ + dom_html_table_caption_element *caption; + dom_html_table_element_get_caption(element, &caption); + _dom_node_remove_child((dom_node_internal *)element, + (dom_node_internal *)caption, + (dom_node_internal **)&caption); + element->caption = NULL; + return DOM_NO_ERR; +} + +/** + * Get or Create the table Foot + * + * \param element The dom_html_table_element object + * \param t_foot The Status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_create_t_foot( + dom_html_table_element *element, + dom_html_element **t_foot) +{ + dom_exception exp; + exp = dom_html_table_element_get_t_foot(element, + (dom_html_table_section_element **)t_foot); + if(exp !=DOM_NO_ERR) { + return exp; + } + if((*t_foot) == NULL) { + dom_html_document *doc = (dom_html_document *) + ((dom_node_internal *) element)->owner; + exp = _dom_html_table_section_element_create(doc, + doc->memoised[hds_TFOOT], + ((dom_node_internal *)element)->namespace, + ((dom_node_internal *)element)->prefix, + (dom_html_table_section_element **)t_foot); + if(exp != DOM_NO_ERR) { + return exp; + } + _dom_node_append_child((dom_node_internal *)element, + (dom_node_internal *)*t_foot, + (dom_node_internal **)t_foot); + element->t_foot = (dom_html_table_section_element *)*t_foot; + + } + return DOM_NO_ERR; +} + +/** + * Delete the table Foot, if one exists + * + * \param element The dom_html_table_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_delete_t_foot( + dom_html_table_element *element) +{ + dom_html_table_section_element *t_foot; + dom_html_table_element_get_t_foot(element, &t_foot); + _dom_node_remove_child((dom_node_internal *)element, + (dom_node_internal *)t_foot, + (dom_node_internal **)&t_foot); + element->t_foot = NULL; + return DOM_NO_ERR; +} + +/** + * Get or Create the table Head + * + * \param element The dom_html_table_element object + * \param t_head The Status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_create_t_head( + dom_html_table_element *element, + dom_html_element **t_head) +{ + dom_html_table_element_get_t_head(element, + (dom_html_table_section_element **)t_head); + if((*t_head) == NULL) { + dom_exception exp; + dom_html_document *doc = (dom_html_document *) + ((dom_node_internal *) element)->owner; + exp = _dom_html_table_section_element_create(doc, + doc->memoised[hds_THEAD], + ((dom_node_internal *)element)->namespace, + ((dom_node_internal *)element)->prefix, + (dom_html_table_section_element **)t_head); + if(exp != DOM_NO_ERR) { + return exp; + } + _dom_node_append_child((dom_node_internal *)element, + (dom_node_internal *)*t_head, + (dom_node_internal **)t_head); + element->t_head = (dom_html_table_section_element *)*t_head; + + } + return DOM_NO_ERR; +} + +/** + * Delete the table Head, if one exists + * + * \param element The dom_html_table_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_delete_t_head( + dom_html_table_element *element) +{ + dom_html_table_section_element *t_head; + dom_html_table_element_get_t_head(element, &t_head); + _dom_node_remove_child((dom_node_internal *)element, + (dom_node_internal *)t_head, + (dom_node_internal **)&t_head); + element->t_head = NULL; + return DOM_NO_ERR; +} + +/** + * Get or Create the table Body + * + * \param element The dom_html_table_element object + * \param t_head The Status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_create_t_body( + dom_html_table_element *element, + dom_html_table_section_element **t_body) +{ + dom_html_collection *t_bodies; + uint32_t len; + dom_html_table_element_get_t_bodies(element, + &t_bodies); + dom_html_collection_get_length(t_bodies, + &len); + + if(len == 0) { + dom_exception exp; + dom_html_document *doc = (dom_html_document *) + ((dom_node_internal *) element)->owner; + exp = _dom_html_table_section_element_create(doc, + doc->memoised[hds_TBODY], + ((dom_node_internal *)element)->namespace, + ((dom_node_internal *)element)->prefix, + t_body); + if(exp != DOM_NO_ERR) { + return exp; + } + return _dom_node_append_child((dom_node_internal *)element, + (dom_node_internal *)*t_body, + (dom_node_internal **)t_body); + + } else { + return dom_html_collection_item(t_bodies, + 0, (dom_node **)t_body); + } + return DOM_NO_ERR; +} +/** + * Insert a new Row into the table + * + * \param element The dom_html_table_element object + * \param index The Index to insert the Row + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_insert_row( + dom_html_table_element *element, + int32_t index, + dom_html_element **row) +{ + dom_exception exp; + dom_html_collection* rows; + uint32_t len; + dom_html_document *doc = (dom_html_document *) + ((dom_node_internal *) element)->owner; + + exp = dom_html_table_element_get_rows(element, + &rows); + if(exp != DOM_NO_ERR) { + return exp; + } + exp = dom_html_collection_get_length(rows, + &len); + + exp = _dom_html_table_row_element_create(doc, + ((dom_node_internal *)element)->namespace, + ((dom_node_internal *)element)->prefix, + (dom_html_table_row_element **)row); + if(exp != DOM_NO_ERR) { + return exp; + } + + if(index > (int32_t)len || index < -1) { + return DOM_INDEX_SIZE_ERR; + } else if(len == 0) { + dom_html_table_section_element *new_body; + exp = dom_html_table_element_create_t_body(element, + &new_body); + if(exp != DOM_NO_ERR) { + return exp; + } + + return _dom_node_append_child((dom_node_internal *)new_body, + (dom_node_internal *)*row, + (dom_node_internal **)row); + + } else { + if(index ==-1) { + index = (int32_t)len; + } + + dom_html_collection* rows; + dom_html_table_section_element *t_head; + dom_html_table_section_element *t_foot; + uint32_t window_len = 0, section_len; + + dom_html_table_element_get_t_head(element, &t_head); + dom_html_table_section_element_get_rows(t_head, &rows); + dom_html_collection_get_length(rows, &section_len); + + if(window_len + section_len > (uint32_t)index || + window_len + section_len == len) { + return dom_html_table_section_element_insert_row(t_head, + index-window_len, row); + } + + window_len += section_len; + + dom_node_internal *n = (dom_node_internal *)element; + + for (n = n->first_child; n != NULL; n = n->next) { + if((n->type == DOM_ELEMENT_NODE) && + dom_string_caseless_isequal(doc->memoised[hds_TBODY],n->name)) { + + dom_html_table_section_element_get_rows((dom_html_table_section_element *)n, &rows); + dom_html_collection_get_length(rows, &section_len); + + if(window_len + section_len > (uint32_t)index || + window_len + section_len == len) { + return dom_html_table_section_element_insert_row( + (dom_html_table_section_element *)n, + index-window_len, row); + } + + window_len += section_len; + } + } + dom_html_table_element_get_t_foot(element, &t_foot); + dom_html_table_section_element_get_rows(t_foot, &rows); + dom_html_collection_get_length(rows, &section_len); + if(window_len + section_len > (uint32_t)index || + window_len +section_len == len) { + return dom_html_table_section_element_insert_row(t_foot, + index-window_len, row); + } + return DOM_INDEX_SIZE_ERR; + } +} +/** + * Delete the table Head, if one exists + * + * \param element The dom_html_table_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_element_delete_row( + dom_html_table_element *element, + int32_t index) +{ + dom_exception exp; + dom_html_collection* rows; + uint32_t len; + dom_html_document *doc = (dom_html_document *) + ((dom_node_internal *) element)->owner; + + exp = dom_html_table_element_get_rows(element, + &rows); + if(exp != DOM_NO_ERR) { + return exp; + } + exp = dom_html_collection_get_length(rows, + &len); + + if(exp != DOM_NO_ERR) { + return exp; + } + + if(index >= (int32_t)len || index < -1 || len ==0) { + return DOM_INDEX_SIZE_ERR; + } else { + if(index ==-1) { + index = (int32_t)len-1; + } + dom_html_collection* rows; + dom_html_table_section_element *t_head; + dom_html_table_section_element *t_foot; + uint32_t window_len = 0, section_len; + dom_html_table_element_get_t_head(element, &t_head); + dom_html_table_section_element_get_rows(t_head, &rows); + dom_html_collection_get_length(rows, &section_len); + if(window_len + section_len > (uint32_t)index) { + return dom_html_table_section_element_delete_row(t_head, + index-window_len); + } + window_len += section_len; + dom_node_internal *n = (dom_node_internal *)element; + for (n = n->first_child; n != NULL; n = n->next) { + if((n->type == DOM_ELEMENT_NODE) && + dom_string_caseless_isequal(doc->memoised[hds_TBODY],n->name)) { + dom_html_table_section_element_get_rows((dom_html_table_section_element *)n, &rows); + dom_html_collection_get_length(rows, &section_len); + if(window_len + section_len > (uint32_t)index) { + return dom_html_table_section_element_delete_row( + (dom_html_table_section_element *)n, + index-window_len); + } + window_len += section_len; + } + } + exp = dom_html_table_element_get_t_foot(element, &t_foot); + dom_html_table_section_element_get_rows(t_foot, &rows); + dom_html_collection_get_length(rows, &section_len); + if(window_len + section_len > (uint32_t)index) { + return dom_html_table_section_element_delete_row(t_foot, + index-window_len); + } + return DOM_INDEX_SIZE_ERR; + } + +} diff --git a/src/html/html_table_element.h b/src/html/html_table_element.h index 2e182d5..caabbe8 100644 --- a/src/html/html_table_element.h +++ b/src/html/html_table_element.h @@ -3,5 +3,61 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_table_element_h_ +#define dom_internal_html_table_element_h_ + +#include <dom/html/html_table_element.h> +#include "html/html_element.h" + +struct dom_html_table_element { + struct dom_html_element base; + /**< The base class */ + dom_html_table_caption_element* caption; + /**< The caption associated with the table*/ + dom_html_table_section_element* t_head; + /**< The thead element associated with the table*/ + dom_html_table_section_element* t_foot; + /**< The tfoot element associated with the table*/ +}; + +/* Create a dom_html_table_element object */ +dom_exception _dom_html_table_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_table_element **ele); + +/* Initialise a dom_html_table_element object */ +dom_exception _dom_html_table_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_table_element *ele); + +/* Finalise a dom_html_table_element object */ +void _dom_html_table_element_finalise(struct dom_html_table_element *ele); + +/* Destroy a dom_html_table_element object */ +void _dom_html_table_element_destroy(struct dom_html_table_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_table_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_table_element_destroy(dom_node_internal *node); +dom_exception _dom_html_table_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_TABLE_ELEMENT_PROTECT_VTABLE \ + _dom_html_table_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_TABLE_ELEMENT \ + _dom_virtual_html_table_element_destroy, \ + _dom_html_table_element_copy + +#endif + +bool table_rows_callback(struct dom_node_internal *node, void *ctx); +bool table_t_bodies_callback(struct dom_node_internal *node, void *ctx); +dom_exception dom_html_table_element_create_t_body( + dom_html_table_element *element, + dom_html_table_section_element **t_body); diff --git a/src/html/html_tablecell_element.c b/src/html/html_tablecell_element.c index f8eaf01..cc596c1 100644 --- a/src/html/html_tablecell_element.c +++ b/src/html/html_tablecell_element.c @@ -191,6 +191,7 @@ dom_exception dom_html_table_cell_element_get_cell_index( } n = n->parent; } + dom_node_internal *root = n; while(n != NULL) { if(n == (dom_node_internal *)table_cell) { break; @@ -207,18 +208,16 @@ dom_exception dom_html_table_cell_element_get_cell_index( } else { /* No children and siblings */ struct dom_node_internal *parent = n->parent; - - while (parent !=NULL) { - if(n == parent->last_child) { - n = parent; - parent = parent->parent; - } else { - break; - } - + while (n == parent->last_child && + n != root) { + n = parent; + parent = parent->parent; } - if(parent == NULL) { + + if(n == root) { n = NULL; + } else { + n = n->next; } } } diff --git a/src/html/html_tablerow_element.c b/src/html/html_tablerow_element.c index 2e182d5..fb3e27b 100644 --- a/src/html/html_tablerow_element.c +++ b/src/html/html_tablerow_element.c @@ -3,5 +3,373 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> + +#include <dom/html/html_tablerow_element.h> +#include <dom/html/html_table_element.h> + +#include "html/html_document.h" +#include "html/html_tablerow_element.h" +#include "html/html_collection.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_TABLE_ROW_ELEMENT + }, + DOM_HTML_TABLE_ROW_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_table_row_element table_row + * + * \param doc The document table_row + * \param ele The returned element table_row + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_table_row_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_table_row_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_table_row_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_table_row_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_table_row_element table_row + * + * \param doc The document table_row + * \param ele The dom_html_table_row_element table_row + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_table_row_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_table_row_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_TR], + namespace, prefix); +} + +/** + * Finalise a dom_html_table_row_element table_row + * + * \param ele The dom_html_table_row_element table_row + */ +void _dom_html_table_row_element_finalise(struct dom_html_table_row_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_table_row_element table_row + * + * \param ele The dom_html_table_row_element table_row + */ +void _dom_html_table_row_element_destroy(struct dom_html_table_row_element *ele) +{ + _dom_html_table_row_element_finalise(ele); + free(ele); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_table_row_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_table_row_element_destroy(dom_node_internal *node) +{ + _dom_html_table_row_element_destroy((struct dom_html_table_row_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_table_row_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_table_row_element_get_##attr( \ + dom_html_table_row_element *element, \ + dom_string **attr) \ +{ \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ +} +#define SIMPLE_SET(attr) \ + dom_exception dom_html_table_row_element_set_##attr( \ + dom_html_table_row_element *element, \ + dom_string *attr) \ +{ \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ +} + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_GET_SET(align); +SIMPLE_GET_SET(bg_color); +SIMPLE_GET_SET(ch); +SIMPLE_GET_SET(ch_off); +SIMPLE_GET_SET(v_align); + +/** + * Get the index of the Row in logical order + * + * \param element The dom_html_table_row_element object + * \param index The Status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_row_element_get_row_index( + dom_html_table_row_element *table_row, int32_t *row_index) +{ + dom_node_internal *n = ((dom_node_internal *)table_row)->parent; + dom_node_internal *parent = n; + dom_html_document *doc = (dom_html_document *) ((dom_node_internal *) table_row)->owner; + uint32_t count = 0; + for(n = n->first_child; n != (dom_node_internal *)table_row; + n = n->next) { + if(n->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(n->name,doc->memoised[hds_TR])) { + count += 1; + } + } + + if(dom_string_caseless_isequal((parent->parent)->name, doc->memoised[hds_TABLE]) && + dom_string_caseless_isequal(parent->name, doc->memoised[hds_THEAD]) + ) { + *row_index = count; + }else if(dom_string_caseless_isequal((parent->parent)->name, doc->memoised[hds_TABLE]) && + (dom_string_caseless_isequal(parent->name, doc->memoised[hds_TBODY]) || + dom_string_caseless_isequal(parent->name, doc->memoised[hds_TFOOT]))) { + uint32_t len; + n = parent->parent; + dom_html_table_section_element *t_head; + dom_html_collection *rows; + dom_html_table_element_get_t_head( + (dom_html_table_element *)(parent->parent), + &t_head); + dom_html_table_section_element_get_rows(t_head, + &rows); + dom_html_collection_get_length(rows, + &len); + count += len; + for(n = n->first_child;n != parent && n != NULL; + n = n->next) { + if(dom_string_caseless_isequal(n->name, doc->memoised[hds_TBODY])) { + dom_html_table_section_element_get_rows( + (dom_html_table_section_element *)n, + &rows); + dom_html_collection_get_length(rows, &len); + count += len; + } + } + *row_index = (int32_t)count; + + } else { + return DOM_HIERARCHY_REQUEST_ERR; + } + return DOM_NO_ERR; +} + +/** + * Get the index of a row within its Section + * + * \param element The dom_html_table_row_element object + * \param index The Status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_row_element_get_section_row_index( + dom_html_table_row_element *table_row, int32_t *section_row_index) +{ + dom_node_internal *n = ((dom_node_internal *)table_row)->parent; + dom_html_document *doc = (dom_html_document *) ((dom_node_internal *) table_row)->owner; + int32_t count = 0; + for(n = n->first_child; n != (dom_node_internal *)table_row; + n = n->next) { + if(n->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(n->name, doc->memoised[hds_TR])) { + count += 1; + } + } + *section_row_index = count; + return DOM_NO_ERR; +} + +/** + * Callback for creating the Cells collection + * + * \param node The dom_node_internal object + * \param ctx The dom_html_document object (void *) + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +bool table_cells_callback(struct dom_node_internal *node, void *ctx) +{ + if(node->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_TD])) { + return true; + } + return false; +} + +/** + * Get the Cells collection + * + * \param element The dom_html_table_element object + * \param t_bodies The Status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_row_element_get_cells( + dom_html_table_row_element *element, + dom_html_collection **cells) +{ + dom_html_document *doc = (dom_html_document *) ((dom_node_internal *) element)->owner; + return _dom_html_collection_create(doc, (dom_node_internal *)element, + table_cells_callback, (void *)doc, cells); +} + +/** + * Insert Cell before the given Index + * + * \param element The dom_html_table_row_element object + * \param index The Index of the Cell node to be inserted + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_row_element_insert_cell( + dom_html_table_row_element *element, + int32_t i

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits June 2014