netsurf-commits May 2014

netsurf-commits@netsurf-browser.org

1 participants
142 discussions

libdom: branch rupindersingh/libdom updated. release/0.1.0-35-gc0e4e6e

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/c0e4e6e975f6c0d096289d... ...commit http://git.netsurf-browser.org/libdom.git/commit/c0e4e6e975f6c0d096289d5c... ...tree http://git.netsurf-browser.org/libdom.git/tree/c0e4e6e975f6c0d096289d5c4d... The branch, rupindersingh/libdom has been updated via c0e4e6e975f6c0d096289d5c4d486e438af75fee (commit) from fe77e7eef56e4ccf592334697ca5d8eeee784111 (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=c0e4e6e975f6c0d09628... commit c0e4e6e975f6c0d096289d5c4d486e438af75fee 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> ----------------------------------------------------------------------- Summary of changes: include/dom/dom.h | 1 + include/dom/html/html_base_element.h | 16 +++++++ src/html/TODO | 6 +- src/html/html_base_element.c | 43 ++++++++++++++++++++ .../level1/html/HTMLBaseElement01.xml.notimpl | 42 ------------------- .../level1/html/HTMLBaseElement02.xml.notimpl | 42 ------------------- 6 files changed, 63 insertions(+), 87 deletions(-) delete mode 100644 test/testcases/tests/level1/html/HTMLBaseElement01.xml.notimpl delete mode 100644 test/testcases/tests/level1/html/HTMLBaseElement02.xml.notimpl 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> -- Document Object Model library

8 years, 9 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-231-gc7ba173

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/c7ba173a6405eca736ee7... ...commit http://git.netsurf-browser.org/netsurf.git/commit/c7ba173a6405eca736ee703... ...tree http://git.netsurf-browser.org/netsurf.git/tree/c7ba173a6405eca736ee70323... The branch, master has been updated via c7ba173a6405eca736ee7032330c00f9939e7c37 (commit) from 0cdc1029460cf86ec7186de4ca46bd3e4637bc3a (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=c7ba173a6405eca736e... commit c7ba173a6405eca736ee7032330c00f9939e7c37 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove completely dead file. NetSurf's list handling has been redundant and unused for years. diff --git a/render/Makefile b/render/Makefile index 12f0314..148c2c3 100644 --- a/render/Makefile +++ b/render/Makefile @@ -1,10 +1,9 @@ # Render sources S_RENDER := box.c box_construct.c box_normalise.c box_textarea.c \ - font.c form.c imagemap.c layout.c list.c search.c table.c \ - textplain.c \ + font.c form.c imagemap.c layout.c search.c table.c textplain.c \ html.c html_css.c html_css_fetcher.c html_script.c \ html_interaction.c html_redraw.c html_forms.c html_object.c -S_RENDER := $(addprefix render/,$(S_RENDER)) \ No newline at end of file +S_RENDER := $(addprefix render/,$(S_RENDER)) diff --git a/render/list.c b/render/list.c deleted file mode 100644 index 8e58f62..0000000 --- a/render/list.c +++ /dev/null @@ -1,483 +0,0 @@ -/* - * Copyright 2005 Richard Wilson <info(a)tinct.net> - * - * 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 - * HTML lists (implementation). - */ -#include <assert.h> -#include <ctype.h> -#include <stdlib.h> -#include <string.h> -#include <strings.h> -#include "css/css.h" -#include "render/list.h" -#include "utils/log.h" - - -struct list_counter { - char *name; /** Counter name */ - struct list_counter_state *first; /** First counter state */ - struct list_counter_state *state; /** Current counter state */ - struct list_counter *next; /** Next counter */ -}; - -struct list_counter_state { - int count; /** Current count */ - struct list_counter_state *parent; /** Parent counter, or NULL */ - struct list_counter_state *next; /** Next counter, or NULL */ -}; - -static struct list_counter *list_counter_pool = NULL; -static char list_counter_workspace[16]; - -static const char *list_counter_roman[] = { "I", "IV", "V", "IX", - "X", "XL", "L", "XC", - "C", "CD", "D", "CM", - "M"}; -static const int list_counter_decimal[] = { 1, 4, 5, 9, - 10, 40, 50, 90, - 100, 400, 500, 900, - 1000}; -#define ROMAN_DECIMAL_CONVERSIONS (sizeof(list_counter_decimal) \ - / sizeof(list_counter_decimal[0])) - - -static struct list_counter *render_list_find_counter(const char *name); -static char *render_list_encode_counter(struct list_counter_state *state, - enum css_list_style_type_e style); -static char *render_list_encode_roman(int value); - -/* -static void render_list_counter_output(char *name); -*/ - -/** - * Finds a counter from the current pool, or adds a new one. - * - * \param name the name of the counter to find - * \return the counter, or NULL if it couldn't be found/created. - */ -static struct list_counter *render_list_find_counter(const char *name) { - struct list_counter *counter; - - assert(name); - /* find a current counter */ - for (counter = list_counter_pool; counter; counter = counter->next) - if (!strcasecmp(name, counter->name)) - return counter; - - /* create a new counter */ - counter = calloc(1, sizeof(struct list_counter)); - if (!counter) { - LOG(("No memory for calloc()")); - return NULL; - } - counter->name = malloc(strlen(name) + 1); - if (!counter->name) { - LOG(("No memory for malloc()")); - free(counter); - return NULL; - } - strcpy(counter->name, name); - counter->next = list_counter_pool; - list_counter_pool = counter; - return counter; -} - - -/** - * Removes all counters from the current pool. - */ -void render_list_destroy_counters(void) { - struct list_counter *counter = list_counter_pool; - struct list_counter *next_counter; - struct list_counter_state *state; - struct list_counter_state *next_state; - - while (counter) { - next_counter = counter->next; - free(counter->name); - state = counter->first; - free(counter); - counter = next_counter; - while (state) { - next_state = state->next; - free(state); - state = next_state; - } - } - list_counter_pool = NULL; -} - - -/** - * Resets a counter in accordance with counter-reset (CSS 2.1/12.4). - * - * \param name the name of the counter to reset - * \param value the value to reset the counter to - * \return true on success, false on failure. - */ -bool render_list_counter_reset(const char *name, int value) { - struct list_counter *counter; - struct list_counter_state *state; - struct list_counter_state *link; - - assert(name); - counter = render_list_find_counter(name); - if (!counter) - return false; - state = calloc(1, sizeof(struct list_counter_state)); - if (!state) { - LOG(("No memory for calloc()")); - return false; - } - state->count = value; - state->parent = counter->state; - counter->state = state; - if (!counter->first) { - counter->first = state; - } else { - for (link = counter->first; link->next; link = link->next); - link->next = state; - } -/* render_list_counter_output(name); -*/ return true; -} - - -/** - * Increments a counter in accordance with counter-increment (CSS 2.1/12.4). - * - * \param name the name of the counter to reset - * \param value the value to increment the counter by - * \return true on success, false on failure. - */ -bool render_list_counter_increment(const char *name, int value) { - struct list_counter *counter; - - assert(name); - counter = render_list_find_counter(name); - if (!counter) - return false; - /* if no counter-reset used, it is assumed the counter has been reset - * to 0 by the root element. */ - if (!counter->state) { - if (counter->first) { - counter->state = counter->first; - counter->state->count = 0; - } else { - render_list_counter_reset(name, 0); - } - } - if (counter->state) - counter->state->count += value; -/* render_list_counter_output(name); -*/ return counter->state != NULL; -} - - -/** - * Ends the scope of a counter. - * - * \param name the name of the counter to end the scope for - * \return true on success, false on failure. - */ -bool render_list_counter_end_scope(const char *name) { - struct list_counter *counter; - - assert(name); - counter = render_list_find_counter(name); - if ((!counter) || (!counter->state)) - return false; - counter->state = counter->state->parent; -/* render_list_counter_output(name); -*/ return true; -} - - -/** - * Returns a textual representation of a counter for counter() or counters() - * (CSS 2.1/12.2). - * - * \param css_counter the counter to convert - * \return a textual representation of the counter, or NULL on failure - */ -char *render_list_counter(const css_computed_content_item *css_counter) { - struct list_counter *counter; - struct list_counter_state *state; - char *compound = NULL; - char *merge, *extend; - lwc_string *name = NULL, *sep = NULL; - uint8_t style; - - assert(css_counter); - - if (css_counter->type == CSS_COMPUTED_CONTENT_COUNTER) { - name = css_counter->data.counter.name; - style = css_counter->data.counter.style; - } else { - assert(css_counter->type == CSS_COMPUTED_CONTENT_COUNTERS); - - name = css_counter->data.counters.name; - sep = css_counter->data.counters.sep; - style = css_counter->data.counters.style; - } - - counter = render_list_find_counter(lwc_string_data(name)); - if (!counter) { - LOG(("Failed to find/create counter for conversion")); - return NULL; - } - - /* handle counter() first */ - if (sep == NULL) - return render_list_encode_counter(counter->state, style); - - /* loop through all states for counters() */ - for (state = counter->first; state; state = state->next) { - merge = render_list_encode_counter(state, style); - if (!merge) { - free(compound); - return NULL; - } - if (!compound) { - compound = merge; - } else { - extend = realloc(compound, strlen(compound) + - strlen(merge) + 1); - if (!extend) { - LOG(("No memory for realloc()")); - free(compound); - free(merge); - return NULL; - } - compound = extend; - strcat(compound, merge); - } - if (state->next) { - merge = realloc(compound, strlen(compound) + - lwc_string_length(sep) + 1); - if (!merge) { - LOG(("No memory for realloc()")); - free(compound); - return NULL; - } - compound = merge; - strcat(compound, lwc_string_data(sep)); - } - } - return compound; -} - - -/** - * Returns a textual representation of a counter state in a specified style. - * - * \param state the counter state to represent - * \param style the counter style to use - * \return a textual representation of the counter state, or NULL on failure - */ -static char *render_list_encode_counter(struct list_counter_state *state, - enum css_list_style_type_e style) { - char *result = NULL; - int i; - - /* no counter state means that the counter is currently out of scope */ - if (!state) { - result = malloc(1); - if (!result) - return NULL; - result[0] = '\0'; - return result; - } - - /* perform the relevant encoding to upper case where applicable */ - switch (style) { - case CSS_LIST_STYLE_TYPE_LOWER_ALPHA: - case CSS_LIST_STYLE_TYPE_UPPER_ALPHA: - if (state->count <= 0) - result = calloc(1, 1); - else - result = malloc(2); - if (!result) - return NULL; - if (state->count > 0) { - result[0] = 'A' + (state->count - 1) % 26; - result[1] = '\0'; - } - break; - case CSS_LIST_STYLE_TYPE_DISC: - case CSS_LIST_STYLE_TYPE_CIRCLE: - case CSS_LIST_STYLE_TYPE_SQUARE: - result = malloc(2); - if (!result) - return NULL; - result[0] = '?'; - result[1] = '\0'; - break; - case CSS_LIST_STYLE_TYPE_LOWER_ROMAN: - case CSS_LIST_STYLE_TYPE_UPPER_ROMAN: - result = render_list_encode_roman(state->count); - if (!result) - return NULL; - break; - case CSS_LIST_STYLE_TYPE_DECIMAL: - snprintf(list_counter_workspace, - sizeof list_counter_workspace, - "%i", state->count); - result = malloc(strlen(list_counter_workspace) + 1); - if (!result) - return NULL; - strcpy(result, list_counter_workspace); - break; - case CSS_LIST_STYLE_TYPE_NONE: - result = malloc(1); - if (!result) - return NULL; - result[0] = '\0'; - break; - default: - break; - } - - /* perform case conversion */ - if ((style == CSS_LIST_STYLE_TYPE_LOWER_ALPHA) || - (style == CSS_LIST_STYLE_TYPE_LOWER_ROMAN)) - for (i = 0; result[i]; i++) - result[i] = tolower(result[i]); - - return result; -} - - -/** - * Encodes a value in roman numerals. - * For values that cannot be represented (ie <=0) an empty string is returned. - * - * \param value the value to represent - * \return a string containing the representation, or NULL on failure - */ -static char *render_list_encode_roman(int value) { - int i, overflow, p = 0; - char temp[10]; - char *result; - - /* zero and below is returned as an empty string and not erred as - * if it is counters() will fail to complete other scopes. */ - if (value <= 0) { - result = malloc(1); - if (!result) - return NULL; - result[0] = '\0'; - return result; - } - - /* we only calculate 1->999 and then add a M for each thousand */ - overflow = value / 1000; - value = value % 1000; - - /* work backwards through the array */ - for (i = ROMAN_DECIMAL_CONVERSIONS - 1; i >= 0; i--) { - while (value >= list_counter_decimal[0]) { - if (value - list_counter_decimal[i] < - list_counter_decimal[0] - 1) - break; - value -= list_counter_decimal[i]; - temp[p++] = list_counter_roman[i][0]; - if (i & 0x1) - temp[p++] = list_counter_roman[i][1]; - } - } - temp[p] = '\0'; - - /* create a copy for the caller including thousands */ - result = malloc(p + overflow + 1); - if (!result) - return NULL; - for (i = 0; i < overflow; i++) - result[i] = 'M'; - strcpy(&result[overflow], temp); - return result; -} - - - - - - - - -void render_list_test(void) { - /* example given in CSS2.1/12.4.1 */ -/* render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); - render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); - render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); -*/ -} -/* -static void render_list_counter_output(char *name) { - struct list_counter *counter; - char *result; - struct css_counter css_counter; - - assert(name); - counter = render_list_find_counter(name); - if (!counter) { - fprintf(stderr, "Unable to create counter '%s'\n", name); - return; - } - - css_counter.name = name; - css_counter.style = CSS_LIST_STYLE_TYPE_LOWER_ALPHA; - css_counter.separator = NULL; - result = render_list_counter(&css_counter); - if (!result) { - fprintf(stderr, "Failed to output counter('%s')\n", name); - } else { - fprintf(stderr, "counter('%s') is '%s'\n", name, result); - free(result); - } - css_counter.separator = "."; - result = render_list_counter(&css_counter); - if (!result) { - fprintf(stderr, "Failed to output counters('%s', '.')\n", name); - } else { - fprintf(stderr, "counters('%s', '.') is '%s'\n", name, result); - free(result); - } -} -*/ diff --git a/render/list.h b/render/list.h deleted file mode 100644 index 626eb59..0000000 --- a/render/list.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2005 Richard Wilson <info(a)tinct.net> - * - * 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 - * HTML lists (interface). - */ - -#ifndef _NETSURF_RENDER_LIST_H_ -#define _NETSURF_RENDER_LIST_H_ - -#include <stdbool.h> - -#include "css/css.h" - -void render_list_destroy_counters(void); -bool render_list_counter_reset(const char *name, int value); -bool render_list_counter_increment(const char *name, int value); -bool render_list_counter_end_scope(const char *name); -char *render_list_counter(const css_computed_content_item *css_counter); - -void render_list_test(void); - -#endif ----------------------------------------------------------------------- Summary of changes: render/Makefile | 5 +- render/list.c | 483 ------------------------------------------------------- render/list.h | 38 ----- 3 files changed, 2 insertions(+), 524 deletions(-) delete mode 100644 render/list.c delete mode 100644 render/list.h diff --git a/render/Makefile b/render/Makefile index 12f0314..148c2c3 100644 --- a/render/Makefile +++ b/render/Makefile @@ -1,10 +1,9 @@ # Render sources S_RENDER := box.c box_construct.c box_normalise.c box_textarea.c \ - font.c form.c imagemap.c layout.c list.c search.c table.c \ - textplain.c \ + font.c form.c imagemap.c layout.c search.c table.c textplain.c \ html.c html_css.c html_css_fetcher.c html_script.c \ html_interaction.c html_redraw.c html_forms.c html_object.c -S_RENDER := $(addprefix render/,$(S_RENDER)) \ No newline at end of file +S_RENDER := $(addprefix render/,$(S_RENDER)) diff --git a/render/list.c b/render/list.c deleted file mode 100644 index 8e58f62..0000000 --- a/render/list.c +++ /dev/null @@ -1,483 +0,0 @@ -/* - * Copyright 2005 Richard Wilson <info(a)tinct.net> - * - * 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 - * HTML lists (implementation). - */ -#include <assert.h> -#include <ctype.h> -#include <stdlib.h> -#include <string.h> -#include <strings.h> -#include "css/css.h" -#include "render/list.h" -#include "utils/log.h" - - -struct list_counter { - char *name; /** Counter name */ - struct list_counter_state *first; /** First counter state */ - struct list_counter_state *state; /** Current counter state */ - struct list_counter *next; /** Next counter */ -}; - -struct list_counter_state { - int count; /** Current count */ - struct list_counter_state *parent; /** Parent counter, or NULL */ - struct list_counter_state *next; /** Next counter, or NULL */ -}; - -static struct list_counter *list_counter_pool = NULL; -static char list_counter_workspace[16]; - -static const char *list_counter_roman[] = { "I", "IV", "V", "IX", - "X", "XL", "L", "XC", - "C", "CD", "D", "CM", - "M"}; -static const int list_counter_decimal[] = { 1, 4, 5, 9, - 10, 40, 50, 90, - 100, 400, 500, 900, - 1000}; -#define ROMAN_DECIMAL_CONVERSIONS (sizeof(list_counter_decimal) \ - / sizeof(list_counter_decimal[0])) - - -static struct list_counter *render_list_find_counter(const char *name); -static char *render_list_encode_counter(struct list_counter_state *state, - enum css_list_style_type_e style); -static char *render_list_encode_roman(int value); - -/* -static void render_list_counter_output(char *name); -*/ - -/** - * Finds a counter from the current pool, or adds a new one. - * - * \param name the name of the counter to find - * \return the counter, or NULL if it couldn't be found/created. - */ -static struct list_counter *render_list_find_counter(const char *name) { - struct list_counter *counter; - - assert(name); - /* find a current counter */ - for (counter = list_counter_pool; counter; counter = counter->next) - if (!strcasecmp(name, counter->name)) - return counter; - - /* create a new counter */ - counter = calloc(1, sizeof(struct list_counter)); - if (!counter) { - LOG(("No memory for calloc()")); - return NULL; - } - counter->name = malloc(strlen(name) + 1); - if (!counter->name) { - LOG(("No memory for malloc()")); - free(counter); - return NULL; - } - strcpy(counter->name, name); - counter->next = list_counter_pool; - list_counter_pool = counter; - return counter; -} - - -/** - * Removes all counters from the current pool. - */ -void render_list_destroy_counters(void) { - struct list_counter *counter = list_counter_pool; - struct list_counter *next_counter; - struct list_counter_state *state; - struct list_counter_state *next_state; - - while (counter) { - next_counter = counter->next; - free(counter->name); - state = counter->first; - free(counter); - counter = next_counter; - while (state) { - next_state = state->next; - free(state); - state = next_state; - } - } - list_counter_pool = NULL; -} - - -/** - * Resets a counter in accordance with counter-reset (CSS 2.1/12.4). - * - * \param name the name of the counter to reset - * \param value the value to reset the counter to - * \return true on success, false on failure. - */ -bool render_list_counter_reset(const char *name, int value) { - struct list_counter *counter; - struct list_counter_state *state; - struct list_counter_state *link; - - assert(name); - counter = render_list_find_counter(name); - if (!counter) - return false; - state = calloc(1, sizeof(struct list_counter_state)); - if (!state) { - LOG(("No memory for calloc()")); - return false; - } - state->count = value; - state->parent = counter->state; - counter->state = state; - if (!counter->first) { - counter->first = state; - } else { - for (link = counter->first; link->next; link = link->next); - link->next = state; - } -/* render_list_counter_output(name); -*/ return true; -} - - -/** - * Increments a counter in accordance with counter-increment (CSS 2.1/12.4). - * - * \param name the name of the counter to reset - * \param value the value to increment the counter by - * \return true on success, false on failure. - */ -bool render_list_counter_increment(const char *name, int value) { - struct list_counter *counter; - - assert(name); - counter = render_list_find_counter(name); - if (!counter) - return false; - /* if no counter-reset used, it is assumed the counter has been reset - * to 0 by the root element. */ - if (!counter->state) { - if (counter->first) { - counter->state = counter->first; - counter->state->count = 0; - } else { - render_list_counter_reset(name, 0); - } - } - if (counter->state) - counter->state->count += value; -/* render_list_counter_output(name); -*/ return counter->state != NULL; -} - - -/** - * Ends the scope of a counter. - * - * \param name the name of the counter to end the scope for - * \return true on success, false on failure. - */ -bool render_list_counter_end_scope(const char *name) { - struct list_counter *counter; - - assert(name); - counter = render_list_find_counter(name); - if ((!counter) || (!counter->state)) - return false; - counter->state = counter->state->parent; -/* render_list_counter_output(name); -*/ return true; -} - - -/** - * Returns a textual representation of a counter for counter() or counters() - * (CSS 2.1/12.2). - * - * \param css_counter the counter to convert - * \return a textual representation of the counter, or NULL on failure - */ -char *render_list_counter(const css_computed_content_item *css_counter) { - struct list_counter *counter; - struct list_counter_state *state; - char *compound = NULL; - char *merge, *extend; - lwc_string *name = NULL, *sep = NULL; - uint8_t style; - - assert(css_counter); - - if (css_counter->type == CSS_COMPUTED_CONTENT_COUNTER) { - name = css_counter->data.counter.name; - style = css_counter->data.counter.style; - } else { - assert(css_counter->type == CSS_COMPUTED_CONTENT_COUNTERS); - - name = css_counter->data.counters.name; - sep = css_counter->data.counters.sep; - style = css_counter->data.counters.style; - } - - counter = render_list_find_counter(lwc_string_data(name)); - if (!counter) { - LOG(("Failed to find/create counter for conversion")); - return NULL; - } - - /* handle counter() first */ - if (sep == NULL) - return render_list_encode_counter(counter->state, style); - - /* loop through all states for counters() */ - for (state = counter->first; state; state = state->next) { - merge = render_list_encode_counter(state, style); - if (!merge) { - free(compound); - return NULL; - } - if (!compound) { - compound = merge; - } else { - extend = realloc(compound, strlen(compound) + - strlen(merge) + 1); - if (!extend) { - LOG(("No memory for realloc()")); - free(compound); - free(merge); - return NULL; - } - compound = extend; - strcat(compound, merge); - } - if (state->next) { - merge = realloc(compound, strlen(compound) + - lwc_string_length(sep) + 1); - if (!merge) { - LOG(("No memory for realloc()")); - free(compound); - return NULL; - } - compound = merge; - strcat(compound, lwc_string_data(sep)); - } - } - return compound; -} - - -/** - * Returns a textual representation of a counter state in a specified style. - * - * \param state the counter state to represent - * \param style the counter style to use - * \return a textual representation of the counter state, or NULL on failure - */ -static char *render_list_encode_counter(struct list_counter_state *state, - enum css_list_style_type_e style) { - char *result = NULL; - int i; - - /* no counter state means that the counter is currently out of scope */ - if (!state) { - result = malloc(1); - if (!result) - return NULL; - result[0] = '\0'; - return result; - } - - /* perform the relevant encoding to upper case where applicable */ - switch (style) { - case CSS_LIST_STYLE_TYPE_LOWER_ALPHA: - case CSS_LIST_STYLE_TYPE_UPPER_ALPHA: - if (state->count <= 0) - result = calloc(1, 1); - else - result = malloc(2); - if (!result) - return NULL; - if (state->count > 0) { - result[0] = 'A' + (state->count - 1) % 26; - result[1] = '\0'; - } - break; - case CSS_LIST_STYLE_TYPE_DISC: - case CSS_LIST_STYLE_TYPE_CIRCLE: - case CSS_LIST_STYLE_TYPE_SQUARE: - result = malloc(2); - if (!result) - return NULL; - result[0] = '?'; - result[1] = '\0'; - break; - case CSS_LIST_STYLE_TYPE_LOWER_ROMAN: - case CSS_LIST_STYLE_TYPE_UPPER_ROMAN: - result = render_list_encode_roman(state->count); - if (!result) - return NULL; - break; - case CSS_LIST_STYLE_TYPE_DECIMAL: - snprintf(list_counter_workspace, - sizeof list_counter_workspace, - "%i", state->count); - result = malloc(strlen(list_counter_workspace) + 1); - if (!result) - return NULL; - strcpy(result, list_counter_workspace); - break; - case CSS_LIST_STYLE_TYPE_NONE: - result = malloc(1); - if (!result) - return NULL; - result[0] = '\0'; - break; - default: - break; - } - - /* perform case conversion */ - if ((style == CSS_LIST_STYLE_TYPE_LOWER_ALPHA) || - (style == CSS_LIST_STYLE_TYPE_LOWER_ROMAN)) - for (i = 0; result[i]; i++) - result[i] = tolower(result[i]); - - return result; -} - - -/** - * Encodes a value in roman numerals. - * For values that cannot be represented (ie <=0) an empty string is returned. - * - * \param value the value to represent - * \return a string containing the representation, or NULL on failure - */ -static char *render_list_encode_roman(int value) { - int i, overflow, p = 0; - char temp[10]; - char *result; - - /* zero and below is returned as an empty string and not erred as - * if it is counters() will fail to complete other scopes. */ - if (value <= 0) { - result = malloc(1); - if (!result) - return NULL; - result[0] = '\0'; - return result; - } - - /* we only calculate 1->999 and then add a M for each thousand */ - overflow = value / 1000; - value = value % 1000; - - /* work backwards through the array */ - for (i = ROMAN_DECIMAL_CONVERSIONS - 1; i >= 0; i--) { - while (value >= list_counter_decimal[0]) { - if (value - list_counter_decimal[i] < - list_counter_decimal[0] - 1) - break; - value -= list_counter_decimal[i]; - temp[p++] = list_counter_roman[i][0]; - if (i & 0x1) - temp[p++] = list_counter_roman[i][1]; - } - } - temp[p] = '\0'; - - /* create a copy for the caller including thousands */ - result = malloc(p + overflow + 1); - if (!result) - return NULL; - for (i = 0; i < overflow; i++) - result[i] = 'M'; - strcpy(&result[overflow], temp); - return result; -} - - - - - - - - -void render_list_test(void) { - /* example given in CSS2.1/12.4.1 */ -/* render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); - render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); - render_list_counter_reset("item", 0); - render_list_counter_increment("item", 1); - render_list_counter_increment("item", 1); - render_list_counter_end_scope("item"); -*/ -} -/* -static void render_list_counter_output(char *name) { - struct list_counter *counter; - char *result; - struct css_counter css_counter; - - assert(name); - counter = render_list_find_counter(name); - if (!counter) { - fprintf(stderr, "Unable to create counter '%s'\n", name); - return; - } - - css_counter.name = name; - css_counter.style = CSS_LIST_STYLE_TYPE_LOWER_ALPHA; - css_counter.separator = NULL; - result = render_list_counter(&css_counter); - if (!result) { - fprintf(stderr, "Failed to output counter('%s')\n", name); - } else { - fprintf(stderr, "counter('%s') is '%s'\n", name, result); - free(result); - } - css_counter.separator = "."; - result = render_list_counter(&css_counter); - if (!result) { - fprintf(stderr, "Failed to output counters('%s', '.')\n", name); - } else { - fprintf(stderr, "counters('%s', '.') is '%s'\n", name, result); - free(result); - } -} -*/ diff --git a/render/list.h b/render/list.h deleted file mode 100644 index 626eb59..0000000 --- a/render/list.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2005 Richard Wilson <info(a)tinct.net> - * - * 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 - * HTML lists (interface). - */ - -#ifndef _NETSURF_RENDER_LIST_H_ -#define _NETSURF_RENDER_LIST_H_ - -#include <stdbool.h> - -#include "css/css.h" - -void render_list_destroy_counters(void); -bool render_list_counter_reset(const char *name, int value); -bool render_list_counter_increment(const char *name, int value); -bool render_list_counter_end_scope(const char *name); -char *render_list_counter(const css_computed_content_item *css_counter); - -void render_list_test(void); - -#endif -- NetSurf Browser

8 years, 9 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-230-g0cdc102

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/0cdc1029460cf86ec7186... ...commit http://git.netsurf-browser.org/netsurf.git/commit/0cdc1029460cf86ec7186de... ...tree http://git.netsurf-browser.org/netsurf.git/tree/0cdc1029460cf86ec7186de4c... The branch, master has been updated via 0cdc1029460cf86ec7186de4ca46bd3e4637bc3a (commit) via ee32aa43feea16911c041436d7c3554b23146387 (commit) via 77cea75e51ba95bb421bdbd8d9c3183408d5a872 (commit) via 4bf23fc2173740e93ee1d81fb31deedc8755768b (commit) from 0793ae25e31d16e691d6a1af9ac31eb42b0420b2 (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=0cdc1029460cf86ec71... commit 0cdc1029460cf86ec7186de4ca46bd3e4637bc3a Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove unused variable. diff --git a/amiga/icon.c b/amiga/icon.c index d0e1c84..01802d3 100644 --- a/amiga/icon.c +++ b/amiga/icon.c @@ -144,7 +144,6 @@ bool amiga_icon_convert(struct content *c) int err; uint8 r, g, b, a; ULONG offset; - const char *url; char *filename = NULL; char *p; ULONG trans, pals1; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ee32aa43feea16911c0... commit ee32aa43feea16911c041436d7c3554b23146387 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove an unused variable. diff --git a/amiga/gui.c b/amiga/gui.c index 19064f9..11f874b 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -638,7 +638,6 @@ static nsurl *gui_get_resource_url(const char *path) { char buf[1024]; char path2[1024]; - char *raw; nsurl *url = NULL; if(ami_locate_resource(buf, path) == false) commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=77cea75e51ba95bb421... commit 77cea75e51ba95bb421bdbd8d9c3183408d5a872 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove unused variable. diff --git a/atari/misc.c b/atari/misc.c index 3e4411e..e689b82 100755 --- a/atari/misc.c +++ b/atari/misc.c @@ -210,7 +210,6 @@ static nserror load_icon_callback(hlcache_handle *handle, hlcache_handle *load_icon(const char *name, hlcache_handle_callback cb, void * pw ) { - const char *icon_url = NULL; hlcache_handle *c; nserror err; nsurl *icon_nsurl; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4bf23fc2173740e93ee... commit 4bf23fc2173740e93ee1d81fb31deedc8755768b Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Fix line endings. diff --git a/atari/misc.c b/atari/misc.c index 849eec9..3e4411e 100755 --- a/atari/misc.c +++ b/atari/misc.c @@ -1,97 +1,97 @@ -/* - * Copyright 2010 Ole Loots <ole(a)monochrom.net> - * - * 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/>. - */ +/* + * Copyright 2010 Ole Loots <ole(a)monochrom.net> + * + * 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/>. + */ #include <assert.h> -#include <stdlib.h> +#include <stdlib.h> #include <stdio.h> -#include <stdbool.h> -#include <string.h> +#include <stdbool.h> +#include <string.h> -#include <sys/types.h> +#include <sys/types.h> #include <mint/osbind.h> #include "content/content.h" -#include "content/hlcache.h" -#include "desktop/cookie_manager.h" +#include "content/hlcache.h" +#include "desktop/cookie_manager.h" #include "desktop/mouse.h" #include "desktop/tree.h" -#include "utils/nsoption.h" -#include "utils/messages.h" -#include "utils/utils.h" -#include "utils/log.h" +#include "utils/nsoption.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/log.h" #include "content/fetch.h" - -#include "atari/gui.h" -#include "atari/toolbar.h" - + +#include "atari/gui.h" +#include "atari/toolbar.h" + #include "atari/misc.h" #include "atari/encoding.h" #include "atari/gemtk/gemtk.h" -#include "cflib.h" - -extern void * h_gem_rsrc; +#include "cflib.h" + +extern void * h_gem_rsrc; struct is_process_running_callback_data { const char * fname; bool found; }; - -void warn_user(const char *warning, const char *detail) -{ - size_t len = 1 + ((warning != NULL) ? strlen(messages_get(warning)) : - 0) + ((detail != 0) ? strlen(detail) : 0); - char message[len]; - snprintf(message, len, messages_get(warning), detail); + +void warn_user(const char *warning, const char *detail) +{ + size_t len = 1 + ((warning != NULL) ? strlen(messages_get(warning)) : + 0) + ((detail != 0) ? strlen(detail) : 0); + char message[len]; + snprintf(message, len, messages_get(warning), detail); printf("%s\n", message); - gemtk_msg_box_show(GEMTK_MSG_BOX_ALERT, message); -} - -void die(const char *error) + gemtk_msg_box_show(GEMTK_MSG_BOX_ALERT, message); +} + +void die(const char *error) { - printf("%s\n", error); + printf("%s\n", error); gemtk_msg_box_show(GEMTK_MSG_BOX_ALERT, error); - exit(1); -} - - -struct gui_window * find_guiwin_by_aes_handle(short handle){ - - struct gui_window * gw; - gw = window_list; - - if( handle == 0 ){ + exit(1); +} + + +struct gui_window * find_guiwin_by_aes_handle(short handle){ + + struct gui_window * gw; + gw = window_list; + + if( handle == 0 ){ return( NULL ); } - while(gw != NULL) { + while(gw != NULL) { if(gw->root->win != NULL - && gemtk_wm_get_handle(gw->root->win) == handle) { - return(gw); - } - else - gw = gw->next; - } - - return( NULL ); + && gemtk_wm_get_handle(gw->root->win) == handle) { + return(gw); + } + else + gw = gw->next; + } + + return( NULL ); } - - + + static int scan_process_list(scan_process_callback cb, void *data) { int pid, count = 0; @@ -186,9 +186,9 @@ bool is_process_running(const char * name) scan_process_list(proc_running_callback, &data); return( (data.found==1) ? true : false ); -} - - +} + + /** * Callback for load_icon(). Should be removed once bitmaps get loaded directly * from disc @@ -251,21 +251,21 @@ hlcache_handle *load_icon(const char *name, hlcache_handle_callback cb, } return c; -} - -void gem_set_cursor( MFORM_EX * cursor ) -{ - static unsigned char flags = 255; - static int number = 255; - if( flags == cursor->flags && number == cursor->number ) - return; +} + +void gem_set_cursor( MFORM_EX * cursor ) +{ + static unsigned char flags = 255; + static int number = 255; + if( flags == cursor->flags && number == cursor->number ) + return; if( cursor->flags & MFORM_EX_FLAG_USERFORM ) { - gemtk_obj_mouse_sprite(cursor->tree, cursor->number); - } else { - graf_mouse(cursor->number, NULL ); - } - number = cursor->number; - flags = cursor->flags; + gemtk_obj_mouse_sprite(cursor->tree, cursor->number); + } else { + graf_mouse(cursor->number, NULL ); + } + number = cursor->number; + flags = cursor->flags; } /** @@ -277,7 +277,7 @@ void gem_set_cursor( MFORM_EX * cursor ) */ long nkc_to_input_key(short nkc, long * ucs4_out) { - unsigned char ascii = (nkc & 0xFF); + unsigned char ascii = (nkc & 0xFF); long ik = 0; // initialize result: @@ -290,131 +290,131 @@ long nkc_to_input_key(short nkc, long * ucs4_out) if( ((nkc & NKF_CTRL) == NKF_CTRL) && ((nkc & (NKF_SHIFT))!=0) ) { } - /* cntrl key only: */ - else if( (nkc & NKF_CTRL) == NKF_CTRL ) { - switch ( ascii ) { - case 'A': - ik = KEY_SELECT_ALL; - break; - - case 'C': - ik = KEY_COPY_SELECTION; - break; - - case 'X': - ik = KEY_CUT_SELECTION; - break; - - case 'V': - ik = KEY_PASTE; - break; - - default: - break; - } + /* cntrl key only: */ + else if( (nkc & NKF_CTRL) == NKF_CTRL ) { + switch ( ascii ) { + case 'A': + ik = KEY_SELECT_ALL; + break; + + case 'C': + ik = KEY_COPY_SELECTION; + break; + + case 'X': + ik = KEY_CUT_SELECTION; + break; + + case 'V': + ik = KEY_PASTE; + break; + + default: + break; + } } - /* shift key only: */ + /* shift key only: */ else if( (nkc & NKF_SHIFT) != 0 ) { - switch( ascii ) { - case NK_TAB: - ik = KEY_SHIFT_TAB; - break; - - case NK_LEFT: - ik = KEY_LINE_START; - break; - - case NK_RIGHT: - ik = KEY_LINE_END; - break; - - case NK_UP: - ik = KEY_PAGE_UP; - break; - - case NK_DOWN: - ik = KEY_PAGE_DOWN; - break; - - default: - break; - } + switch( ascii ) { + case NK_TAB: + ik = KEY_SHIFT_TAB; + break; + + case NK_LEFT: + ik = KEY_LINE_START; + break; + + case NK_RIGHT: + ik = KEY_LINE_END; + break; + + case NK_UP: + ik = KEY_PAGE_UP; + break; + + case NK_DOWN: + ik = KEY_PAGE_DOWN; + break; + + default: + break; + } } - /* No modifier keys: */ - else { + /* No modifier keys: */ + else { switch( ascii ) { case NK_INS: ik = KEY_PASTE; break; - - case NK_BS: - ik = KEY_DELETE_LEFT; - break; - - case NK_DEL: - ik = KEY_DELETE_RIGHT; - break; - - case NK_TAB: - ik = KEY_TAB; - break; - - - case NK_ENTER: - ik = KEY_NL; - break; - - case NK_RET: - ik = KEY_CR; - break; - - case NK_ESC: - ik = KEY_ESCAPE; - break; - - case NK_CLRHOME: - ik = KEY_TEXT_START; - break; - - case NK_RIGHT: - ik = KEY_RIGHT; - break; - - case NK_LEFT: - ik = KEY_LEFT; - break; - - case NK_UP: - ik = KEY_UP; + + case NK_BS: + ik = KEY_DELETE_LEFT; + break; + + case NK_DEL: + ik = KEY_DELETE_RIGHT; + break; + + case NK_TAB: + ik = KEY_TAB; + break; + + + case NK_ENTER: + ik = KEY_NL; + break; + + case NK_RET: + ik = KEY_CR; + break; + + case NK_ESC: + ik = KEY_ESCAPE; + break; + + case NK_CLRHOME: + ik = KEY_TEXT_START; + break; + + case NK_RIGHT: + ik = KEY_RIGHT; + break; + + case NK_LEFT: + ik = KEY_LEFT; + break; + + case NK_UP: + ik = KEY_UP; break; case NK_UNDO: ik = KEY_UNDO; - break; - - case NK_DOWN: - ik = KEY_DOWN; - break; - - case NK_M_PGUP: - ik = KEY_PAGE_UP; - break; - - case NK_M_PGDOWN: - ik = KEY_PAGE_DOWN; - break; - - default: - break; - } + break; + + case NK_DOWN: + ik = KEY_DOWN; + break; + + case NK_M_PGUP: + ik = KEY_PAGE_UP; + break; + + case NK_M_PGDOWN: + ik = KEY_PAGE_DOWN; + break; + + default: + break; + } } - - if( ik == 0 && ( (nkc & NKF_CTRL)==0) ) { + + if( ik == 0 && ( (nkc & NKF_CTRL)==0) ) { if (ascii >= 9 ) { *ucs4_out = atari_to_ucs4(ascii); - } - } + } + } return ( ik ); } @@ -448,25 +448,25 @@ const char * file_select(const char * title, const char * name) { return( NULL ); } - - -void dbg_grect(const char * str, GRECT * r) -{ - printf("%s: x: %d, y: %d, w: %d, h: %d (x2: %d, y2: %d)\n", str, - r->g_x, r->g_y, r->g_w, r->g_h, r->g_x + r->g_w, r->g_y + r->g_h); -} - -void dbg_pxy(const char * str, short * pxy ) -{ - printf("%s: x: %d, y: %d, w: %d, h: %d\n", str, - pxy[0], pxy[1], pxy[2], pxy[3] ); + + +void dbg_grect(const char * str, GRECT * r) +{ + printf("%s: x: %d, y: %d, w: %d, h: %d (x2: %d, y2: %d)\n", str, + r->g_x, r->g_y, r->g_w, r->g_h, r->g_x + r->g_w, r->g_y + r->g_h); +} + +void dbg_pxy(const char * str, short * pxy ) +{ + printf("%s: x: %d, y: %d, w: %d, h: %d\n", str, + pxy[0], pxy[1], pxy[2], pxy[3] ); } -void dbg_rect(const char * str, int * pxy) -{ - printf("%s: x0: %d, y0: %d, x1: %d, y1: %d (w: %d, h: %d)\n", str, +void dbg_rect(const char * str, int * pxy) +{ + printf("%s: x0: %d, y0: %d, x1: %d, y1: %d (w: %d, h: %d)\n", str, pxy[0], pxy[1], pxy[2], pxy[3], pxy[2] - pxy[0], - pxy[3] - pxy[1] ); -} - + pxy[3] - pxy[1] ); +} + ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 1 - amiga/icon.c | 1 - atari/misc.c | 427 +++++++++++++++++++++++++++++----------------------------- 3 files changed, 213 insertions(+), 216 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index 19064f9..11f874b 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -638,7 +638,6 @@ static nsurl *gui_get_resource_url(const char *path) { char buf[1024]; char path2[1024]; - char *raw; nsurl *url = NULL; if(ami_locate_resource(buf, path) == false) diff --git a/amiga/icon.c b/amiga/icon.c index d0e1c84..01802d3 100644 --- a/amiga/icon.c +++ b/amiga/icon.c @@ -144,7 +144,6 @@ bool amiga_icon_convert(struct content *c) int err; uint8 r, g, b, a; ULONG offset; - const char *url; char *filename = NULL; char *p; ULONG trans, pals1; diff --git a/atari/misc.c b/atari/misc.c index 849eec9..e689b82 100755 --- a/atari/misc.c +++ b/atari/misc.c @@ -1,97 +1,97 @@ -/* - * Copyright 2010 Ole Loots <ole(a)monochrom.net> - * - * 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/>. - */ +/* + * Copyright 2010 Ole Loots <ole(a)monochrom.net> + * + * 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/>. + */ #include <assert.h> -#include <stdlib.h> +#include <stdlib.h> #include <stdio.h> -#include <stdbool.h> -#include <string.h> +#include <stdbool.h> +#include <string.h> -#include <sys/types.h> +#include <sys/types.h> #include <mint/osbind.h> #include "content/content.h" -#include "content/hlcache.h" -#include "desktop/cookie_manager.h" +#include "content/hlcache.h" +#include "desktop/cookie_manager.h" #include "desktop/mouse.h" #include "desktop/tree.h" -#include "utils/nsoption.h" -#include "utils/messages.h" -#include "utils/utils.h" -#include "utils/log.h" +#include "utils/nsoption.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/log.h" #include "content/fetch.h" - -#include "atari/gui.h" -#include "atari/toolbar.h" - + +#include "atari/gui.h" +#include "atari/toolbar.h" + #include "atari/misc.h" #include "atari/encoding.h" #include "atari/gemtk/gemtk.h" -#include "cflib.h" - -extern void * h_gem_rsrc; +#include "cflib.h" + +extern void * h_gem_rsrc; struct is_process_running_callback_data { const char * fname; bool found; }; - -void warn_user(const char *warning, const char *detail) -{ - size_t len = 1 + ((warning != NULL) ? strlen(messages_get(warning)) : - 0) + ((detail != 0) ? strlen(detail) : 0); - char message[len]; - snprintf(message, len, messages_get(warning), detail); + +void warn_user(const char *warning, const char *detail) +{ + size_t len = 1 + ((warning != NULL) ? strlen(messages_get(warning)) : + 0) + ((detail != 0) ? strlen(detail) : 0); + char message[len]; + snprintf(message, len, messages_get(warning), detail); printf("%s\n", message); - gemtk_msg_box_show(GEMTK_MSG_BOX_ALERT, message); -} - -void die(const char *error) + gemtk_msg_box_show(GEMTK_MSG_BOX_ALERT, message); +} + +void die(const char *error) { - printf("%s\n", error); + printf("%s\n", error); gemtk_msg_box_show(GEMTK_MSG_BOX_ALERT, error); - exit(1); -} - - -struct gui_window * find_guiwin_by_aes_handle(short handle){ - - struct gui_window * gw; - gw = window_list; - - if( handle == 0 ){ + exit(1); +} + + +struct gui_window * find_guiwin_by_aes_handle(short handle){ + + struct gui_window * gw; + gw = window_list; + + if( handle == 0 ){ return( NULL ); } - while(gw != NULL) { + while(gw != NULL) { if(gw->root->win != NULL - && gemtk_wm_get_handle(gw->root->win) == handle) { - return(gw); - } - else - gw = gw->next; - } - - return( NULL ); + && gemtk_wm_get_handle(gw->root->win) == handle) { + return(gw); + } + else + gw = gw->next; + } + + return( NULL ); } - - + + static int scan_process_list(scan_process_callback cb, void *data) { int pid, count = 0; @@ -186,9 +186,9 @@ bool is_process_running(const char * name) scan_process_list(proc_running_callback, &data); return( (data.found==1) ? true : false ); -} - - +} + + /** * Callback for load_icon(). Should be removed once bitmaps get loaded directly * from disc @@ -210,7 +210,6 @@ static nserror load_icon_callback(hlcache_handle *handle, hlcache_handle *load_icon(const char *name, hlcache_handle_callback cb, void * pw ) { - const char *icon_url = NULL; hlcache_handle *c; nserror err; nsurl *icon_nsurl; @@ -251,21 +250,21 @@ hlcache_handle *load_icon(const char *name, hlcache_handle_callback cb, } return c; -} - -void gem_set_cursor( MFORM_EX * cursor ) -{ - static unsigned char flags = 255; - static int number = 255; - if( flags == cursor->flags && number == cursor->number ) - return; +} + +void gem_set_cursor( MFORM_EX * cursor ) +{ + static unsigned char flags = 255; + static int number = 255; + if( flags == cursor->flags && number == cursor->number ) + return; if( cursor->flags & MFORM_EX_FLAG_USERFORM ) { - gemtk_obj_mouse_sprite(cursor->tree, cursor->number); - } else { - graf_mouse(cursor->number, NULL ); - } - number = cursor->number; - flags = cursor->flags; + gemtk_obj_mouse_sprite(cursor->tree, cursor->number); + } else { + graf_mouse(cursor->number, NULL ); + } + number = cursor->number; + flags = cursor->flags; } /** @@ -277,7 +276,7 @@ void gem_set_cursor( MFORM_EX * cursor ) */ long nkc_to_input_key(short nkc, long * ucs4_out) { - unsigned char ascii = (nkc & 0xFF); + unsigned char ascii = (nkc & 0xFF); long ik = 0; // initialize result: @@ -290,131 +289,131 @@ long nkc_to_input_key(short nkc, long * ucs4_out) if( ((nkc & NKF_CTRL) == NKF_CTRL) && ((nkc & (NKF_SHIFT))!=0) ) { } - /* cntrl key only: */ - else if( (nkc & NKF_CTRL) == NKF_CTRL ) { - switch ( ascii ) { - case 'A': - ik = KEY_SELECT_ALL; - break; - - case 'C': - ik = KEY_COPY_SELECTION; - break; - - case 'X': - ik = KEY_CUT_SELECTION; - break; - - case 'V': - ik = KEY_PASTE; - break; - - default: - break; - } + /* cntrl key only: */ + else if( (nkc & NKF_CTRL) == NKF_CTRL ) { + switch ( ascii ) { + case 'A': + ik = KEY_SELECT_ALL; + break; + + case 'C': + ik = KEY_COPY_SELECTION; + break; + + case 'X': + ik = KEY_CUT_SELECTION; + break; + + case 'V': + ik = KEY_PASTE; + break; + + default: + break; + } } - /* shift key only: */ + /* shift key only: */ else if( (nkc & NKF_SHIFT) != 0 ) { - switch( ascii ) { - case NK_TAB: - ik = KEY_SHIFT_TAB; - break; - - case NK_LEFT: - ik = KEY_LINE_START; - break; - - case NK_RIGHT: - ik = KEY_LINE_END; - break; - - case NK_UP: - ik = KEY_PAGE_UP; - break; - - case NK_DOWN: - ik = KEY_PAGE_DOWN; - break; - - default: - break; - } + switch( ascii ) { + case NK_TAB: + ik = KEY_SHIFT_TAB; + break; + + case NK_LEFT: + ik = KEY_LINE_START; + break; + + case NK_RIGHT: + ik = KEY_LINE_END; + break; + + case NK_UP: + ik = KEY_PAGE_UP; + break; + + case NK_DOWN: + ik = KEY_PAGE_DOWN; + break; + + default: + break; + } } - /* No modifier keys: */ - else { + /* No modifier keys: */ + else { switch( ascii ) { case NK_INS: ik = KEY_PASTE; break; - - case NK_BS: - ik = KEY_DELETE_LEFT; - break; - - case NK_DEL: - ik = KEY_DELETE_RIGHT; - break; - - case NK_TAB: - ik = KEY_TAB; - break; - - - case NK_ENTER: - ik = KEY_NL; - break; - - case NK_RET: - ik = KEY_CR; - break; - - case NK_ESC: - ik = KEY_ESCAPE; - break; - - case NK_CLRHOME: - ik = KEY_TEXT_START; - break; - - case NK_RIGHT: - ik = KEY_RIGHT; - break; - - case NK_LEFT: - ik = KEY_LEFT; - break; - - case NK_UP: - ik = KEY_UP; + + case NK_BS: + ik = KEY_DELETE_LEFT; + break; + + case NK_DEL: + ik = KEY_DELETE_RIGHT; + break; + + case NK_TAB: + ik = KEY_TAB; + break; + + + case NK_ENTER: + ik = KEY_NL; + break; + + case NK_RET: + ik = KEY_CR; + break; + + case NK_ESC: + ik = KEY_ESCAPE; + break; + + case NK_CLRHOME: + ik = KEY_TEXT_START; + break; + + case NK_RIGHT: + ik = KEY_RIGHT; + break; + + case NK_LEFT: + ik = KEY_LEFT; + break; + + case NK_UP: + ik = KEY_UP; break; case NK_UNDO: ik = KEY_UNDO; - break; - - case NK_DOWN: - ik = KEY_DOWN; - break; - - case NK_M_PGUP: - ik = KEY_PAGE_UP; - break; - - case NK_M_PGDOWN: - ik = KEY_PAGE_DOWN; - break; - - default: - break; - } + break; + + case NK_DOWN: + ik = KEY_DOWN; + break; + + case NK_M_PGUP: + ik = KEY_PAGE_UP; + break; + + case NK_M_PGDOWN: + ik = KEY_PAGE_DOWN; + break; + + default: + break; + } } - - if( ik == 0 && ( (nkc & NKF_CTRL)==0) ) { + + if( ik == 0 && ( (nkc & NKF_CTRL)==0) ) { if (ascii >= 9 ) { *ucs4_out = atari_to_ucs4(ascii); - } - } + } + } return ( ik ); } @@ -448,25 +447,25 @@ const char * file_select(const char * title, const char * name) { return( NULL ); } - - -void dbg_grect(const char * str, GRECT * r) -{ - printf("%s: x: %d, y: %d, w: %d, h: %d (x2: %d, y2: %d)\n", str, - r->g_x, r->g_y, r->g_w, r->g_h, r->g_x + r->g_w, r->g_y + r->g_h); -} - -void dbg_pxy(const char * str, short * pxy ) -{ - printf("%s: x: %d, y: %d, w: %d, h: %d\n", str, - pxy[0], pxy[1], pxy[2], pxy[3] ); + + +void dbg_grect(const char * str, GRECT * r) +{ + printf("%s: x: %d, y: %d, w: %d, h: %d (x2: %d, y2: %d)\n", str, + r->g_x, r->g_y, r->g_w, r->g_h, r->g_x + r->g_w, r->g_y + r->g_h); +} + +void dbg_pxy(const char * str, short * pxy ) +{ + printf("%s: x: %d, y: %d, w: %d, h: %d\n", str, + pxy[0], pxy[1], pxy[2], pxy[3] ); } -void dbg_rect(const char * str, int * pxy) -{ - printf("%s: x0: %d, y0: %d, x1: %d, y1: %d (w: %d, h: %d)\n", str, +void dbg_rect(const char * str, int * pxy) +{ + printf("%s: x0: %d, y0: %d, x1: %d, y1: %d (w: %d, h: %d)\n", str, pxy[0], pxy[1], pxy[2], pxy[3], pxy[2] - pxy[0], - pxy[3] - pxy[1] ); -} - + pxy[3] - pxy[1] ); +} + -- NetSurf Browser

8 years, 9 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-226-g0793ae2

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/0793ae25e31d16e691d6a... ...commit http://git.netsurf-browser.org/netsurf.git/commit/0793ae25e31d16e691d6a1a... ...tree http://git.netsurf-browser.org/netsurf.git/tree/0793ae25e31d16e691d6a1af9... The branch, master has been updated via 0793ae25e31d16e691d6a1af9ac31eb42b0420b2 (commit) via ce117d140e25730be3df91408d97adeb48b30ec2 (commit) via 910efb015648763dce601f147b3e6173f262ef89 (commit) via c01e168d64fd3f4c05d5bb64b2f2e4d47ef940e4 (commit) via dcf9eca7b3b4f42f40d9610595f9fcaea0370cfc (commit) via 8ee941a7a52d795b601fdded34918cd2eafbda41 (commit) via bbb002ee1da7655f94ffb607db5e3b7c108d53ba (commit) via ecee6ffad8d11f16c63ee99309110c5ef7c349a2 (commit) via 33513e65eae324f51875d11e88154c9c294cf3b8 (commit) via 2f02d0785a4abd6977cd5716a33c604377703d5d (commit) via 55b3163520197148556aeb8ea2e7f779d54b0dc5 (commit) via 259a02a72a9ffec44a5216cbe0ce1506d05d5b93 (commit) via f313635e2158a32de7cf558146015a05c1de27bc (commit) via 0b39a3750c20463a1a4d8e4b5a62caeb72464cf8 (commit) via ef8b0e82044df2b62b41abd3652565c1d5330cfe (commit) via dca506dfe4a38b66259c554979a64d025615e836 (commit) via ae0e1316b773686c24d14b428cee80a4e9ed3bad (commit) via bab90eddda91c6eeff7452e73be3d7949aac51d3 (commit) via 4fbe86bc5a87d98adb49da85685d5c097bd91452 (commit) via 3ce61d6950f5c07991468f1ec4bb1f4915cb60e8 (commit) via 4ea90d2dcabdb6949dca1d8f8700004df1478599 (commit) via d0e67542f54647fd1e02f5aca3f1e3f6bb0ccec2 (commit) via d25b62f1c2de187adedf782bae19e1e2eb86eb54 (commit) from e9d53022a46b94c45eba7b0f7f99cd07a885e5a0 (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=0793ae25e31d16e691d... commit 0793ae25e31d16e691d6a1af9ac31eb42b0420b2 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Scope reduce some variables. diff --git a/riscos/window.c b/riscos/window.c index 16af908..876ad0e 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -412,7 +412,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw, struct gui_window *existing, gui_window_create_flags flags) { - int screen_width, screen_height, win_width, win_height, scroll_width; + int screen_width, screen_height; static int window_count = 2; wimp_window window; wimp_window_state state; @@ -451,19 +451,24 @@ static struct gui_window *gui_window_create(struct browser_window *bw, window.visible.y1 = state.visible.y1 - 48; open_centred = false; } else { + int win_width, win_height; ro_gui_screen_size(&screen_width, &screen_height); /* Check if we have a preferred position */ if ((nsoption_int(window_screen_width) != 0) && (nsoption_int(window_screen_height) != 0)) { - win_width = (nsoption_int(window_width) * screen_width) / - nsoption_int(window_screen_width); - win_height = (nsoption_int(window_height) * screen_height) / - nsoption_int(window_screen_height); - window.visible.x0 = (nsoption_int(window_x) * screen_width) / - nsoption_int(window_screen_width); - window.visible.y0 = (nsoption_int(window_y) * screen_height) / - nsoption_int(window_screen_height); + win_width = (nsoption_int(window_width) * + screen_width) / + nsoption_int(window_screen_width); + win_height = (nsoption_int(window_height) * + screen_height) / + nsoption_int(window_screen_height); + window.visible.x0 = (nsoption_int(window_x) * + screen_width) / + nsoption_int(window_screen_width); + window.visible.y0 = (nsoption_int(window_y) * + screen_height) / + nsoption_int(window_screen_height); if (nsoption_bool(window_stagger)) { window.visible.y0 += 96 - (48 * (window_count % 5)); @@ -535,7 +540,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw, wimp_WINDOW_TOGGLE_ICON; if (open_centred) { - scroll_width = ro_get_vscroll_width(NULL); + int scroll_width = ro_get_vscroll_width(NULL); window.visible.x0 -= scroll_width; } @@ -684,13 +689,12 @@ static void gui_window_destroy(struct gui_window *g) static void gui_window_set_title(struct gui_window *g, const char *title) { - int scale_disp; - assert(g); assert(title); if (g->bw->scale != 1.0) { - scale_disp = g->bw->scale * 100; + int scale_disp = g->bw->scale * 100; + if (ABS((float)scale_disp - g->bw->scale * 100) >= 0.05) snprintf(g->title, sizeof g->title, "%s (%.1f%%)", title, g->bw->scale * 100); @@ -972,7 +976,6 @@ static void gui_window_update_extent(struct gui_window *g) wimp_window_state state; bool update; unsigned int flags; - int scroll = 0; assert(g); @@ -987,7 +990,7 @@ static void gui_window_update_extent(struct gui_window *g) /* scroll on toolbar height change */ if (g->toolbar) { - scroll = ro_toolbar_height(g->toolbar) - info.extent.y1; + int scroll = ro_toolbar_height(g->toolbar) - info.extent.y1; info.yscroll += scroll; } @@ -1246,13 +1249,12 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type, const struct rect *rect) { wimp_pointer pointer; - os_error *error; wimp_drag drag; if (rect != NULL) { /* We have a box to constrain the pointer to, for the drag * duration */ - error = xwimp_get_pointer_info(&pointer); + os_error *error = xwimp_get_pointer_info(&pointer); if (error) { LOG(("xwimp_get_pointer_info 0x%x : %s", error->errnum, error->errmess)); @@ -1505,8 +1507,7 @@ void ro_gui_window_open(wimp_open *open) struct gui_window *g = (struct gui_window *)ro_gui_wimp_event_get_user_data(open->w); int width = open->visible.x1 - open->visible.x0; int height = open->visible.y1 - open->visible.y0; - int size, toolbar_height = 0; - bool no_vscroll, no_hscroll; + int toolbar_height = 0; float new_scale = 0; hlcache_handle *h; wimp_window_state state; @@ -1546,9 +1547,11 @@ void ro_gui_window_open(wimp_open *open) /* handle 'auto' scroll bars' and non-fitting scrollbar removal */ if ((g->bw->scrolling == SCROLLING_AUTO) || (g->bw->scrolling == SCROLLING_YES)) { + int size; + /* windows lose scrollbars when containing a frameset */ - no_hscroll = false; - no_vscroll = g->bw->children; + bool no_hscroll = false; + bool no_vscroll = g->bw->children; /* hscroll */ size = ro_get_hscroll_height(NULL); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ce117d140e25730be3d... commit ce117d140e25730be3df91408d97adeb48b30ec2 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove dead code and variables. diff --git a/riscos/window.c b/riscos/window.c index b8eb1b6..16af908 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1505,7 +1505,7 @@ void ro_gui_window_open(wimp_open *open) struct gui_window *g = (struct gui_window *)ro_gui_wimp_event_get_user_data(open->w); int width = open->visible.x1 - open->visible.x0; int height = open->visible.y1 - open->visible.y0; - int size, fheight, fwidth, toolbar_height = 0; + int size, toolbar_height = 0; bool no_vscroll, no_hscroll; float new_scale = 0; hlcache_handle *h; @@ -1554,9 +1554,6 @@ void ro_gui_window_open(wimp_open *open) size = ro_get_hscroll_height(NULL); if (g->bw->border) size -= 2; - fheight = height; - if (state.flags & wimp_WINDOW_HSCROLL) - fheight += size; if (!no_hscroll) { if (!(state.flags & wimp_WINDOW_HSCROLL)) { height -= size; @@ -1583,9 +1580,6 @@ void ro_gui_window_open(wimp_open *open) size = ro_get_vscroll_width(NULL); if (g->bw->border) size -= 2; - fwidth = width; - if (state.flags & wimp_WINDOW_VSCROLL) - fwidth += size; if (!no_vscroll) { if (!(state.flags & wimp_WINDOW_VSCROLL)) { width -= size; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=910efb015648763dce6... commit 910efb015648763dce601f147b3e6173f262ef89 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Scope reduce several variables. diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c index d048b9a..d42d2b0 100644 --- a/riscos/wimp_event.c +++ b/riscos/wimp_event.c @@ -634,7 +634,6 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) int current, step, stepping, min, max, decimal_places; wimp_window_state open; wimp_caret caret; - os_error *error; bool prepared; w = pointer->w; @@ -702,6 +701,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) * button, then close the menu (which closes us) and then finally * re-open ourselves. ugh! */ if (current_menu != NULL) { + os_error *error; open.w = pointer->w; error = xwimp_get_window_state(&open); if (error) { @@ -1163,25 +1163,25 @@ bool ro_gui_wimp_event_pointer_entering_window(wimp_entering *entering) bool ro_gui_wimp_event_process_window_menu_click(wimp_pointer *pointer) { struct event_window *window; - int xpos, ypos, line_height, gap_height, entry; window = ro_gui_wimp_event_find_window(pointer->w); if ((window) && (window->window_menu) && (pointer->buttons == wimp_CLICK_MENU)) { + int xpos, ypos; + if (window->menu_prepare) if (!window->menu_prepare(window->w, wimp_ICON_WINDOW, window->window_menu, pointer)) return false; if (window->window_menu_iconbar) { - xpos = pointer->pos.x; - ypos = 96; - - line_height = window->window_menu->height + + int entry = 0; + int line_height = window->window_menu->height + window->window_menu->gap; - gap_height = 24; /* The fixed dotted line height */ + int gap_height = 24; /* The fixed dotted line height */ - entry = 0; + xpos = pointer->pos.x; + ypos = 96; do { ypos += line_height; if ((window->window_menu-> @@ -1340,7 +1340,6 @@ bool ro_gui_wimp_event_register_checkbox(wimp_w w, wimp_i i) bool ro_gui_wimp_event_register_radio(wimp_w w, wimp_i *i) { struct event_window *window; - struct icon_event *event; window = ro_gui_wimp_event_get_window(w); if (!window) @@ -1348,7 +1347,8 @@ bool ro_gui_wimp_event_register_radio(wimp_w w, wimp_i *i) window->max_radio_group++; while (*i != -1) { - event = ro_gui_wimp_event_get_event(w, *i, EVENT_RADIO); + struct icon_event *event = ro_gui_wimp_event_get_event(w, *i, + EVENT_RADIO); if (!event) return false; event->data.radio_group = window->max_radio_group; diff --git a/riscos/window.c b/riscos/window.c index 0c95e5b..b8eb1b6 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1673,7 +1673,7 @@ void ro_gui_window_close(wimp_w w) struct gui_window *g = (struct gui_window *)ro_gui_wimp_event_get_user_data(w); wimp_pointer pointer; os_error *error; - char *temp_name, *r; + char *temp_name; char *filename = NULL; hlcache_handle *h = NULL; bool destroy; @@ -1697,6 +1697,7 @@ void ro_gui_window_close(wimp_w w) if (filename != NULL) { temp_name = malloc(strlen(filename) + 32); if (temp_name) { + char *r; sprintf(temp_name, "Filer_OpenDir %s", filename); r = temp_name + strlen(temp_name); @@ -1894,13 +1895,11 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, os_error *ro_error; wimp_pointer pointer; os_coord pos; - const char *toolbar_url; float scale; uint32_t c = (uint32_t) key->c; wimp_scroll_direction xscroll = wimp_SCROLL_NONE; wimp_scroll_direction yscroll = wimp_SCROLL_NONE; nsurl *url; - nserror error; if (g == NULL) return false; @@ -1924,7 +1923,9 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, switch (c) { case IS_WIMP_KEY + wimp_KEY_F1: /* Help. */ { - error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url); + nserror error = nsurl_create( + "http://www.netsurf-browser.org/documentation/", + &url); if (error == NSERROR_OK) { error = browser_window_create(BW_CREATE_HISTORY, url, @@ -2032,6 +2033,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, case wimp_KEY_RETURN: if (is_toolbar) { + const char *toolbar_url; toolbar_url = ro_toolbar_get_url(g->toolbar); if (toolbar_url != NULL) ro_gui_window_launch_url(g, toolbar_url); @@ -3590,7 +3592,6 @@ void ro_gui_window_toolbar_click(void *data, { struct gui_window *g = data; struct browser_window *new_bw; - gui_save_type save_type; if (g == NULL) return; @@ -3599,6 +3600,9 @@ void ro_gui_window_toolbar_click(void *data, if (action_type == TOOLBAR_ACTION_URL) { switch (action.url) { case TOOLBAR_URL_DRAG_URL: + { + gui_save_type save_type; + if (g->bw->current_content == NULL) break; @@ -3612,6 +3616,7 @@ void ro_gui_window_toolbar_click(void *data, ro_gui_drag_save_link(save_type, nsurl_access(hlcache_handle_get_url(h)), content_get_title(h), g); + } break; case TOOLBAR_URL_SELECT_HOTLIST: @@ -3862,10 +3867,9 @@ bool ro_gui_window_up_available(struct browser_window *bw) { bool result = false; nsurl *parent; - nserror err; if (bw != NULL && bw->current_content != NULL) { - err = nsurl_parent(hlcache_handle_get_url( + nserror err = nsurl_parent(hlcache_handle_get_url( bw->current_content), &parent); if (err == NSERROR_OK) { result = nsurl_compare(hlcache_handle_get_url( @@ -3890,7 +3894,6 @@ void ro_gui_window_prepare_pageinfo(struct gui_window *g) hlcache_handle *h = g->bw->current_content; char icon_buf[20] = "file_xxx"; char enc_buf[40]; - char enc_token[10] = "Encoding0"; const char *icon = icon_buf; const char *title, *url; lwc_string *mime; @@ -3912,6 +3915,7 @@ void ro_gui_window_prepare_pageinfo(struct gui_window *g) if (content_get_type(h) == CONTENT_HTML) { if (html_get_encoding(h)) { + char enc_token[10] = "Encoding0"; enc_token[8] = '0' + html_get_encoding_source(h); snprintf(enc_buf, sizeof enc_buf, "%s (%s)", html_get_encoding(h), @@ -3991,13 +3995,13 @@ void ro_gui_window_prepare_objectinfo(hlcache_handle *object, const char *href) void ro_gui_window_launch_url(struct gui_window *g, const char *url1) { char *url2; /** @todo The risc os maintainer needs to examine why the url is copied here */ - nsurl *url; - nserror error; ro_gui_url_complete_close(); url2 = strdup(url1); if (url2 != NULL) { + nserror error; + nsurl *url; gui_window_set_url(g, url2); @@ -4408,10 +4412,8 @@ void ro_gui_window_process_reformats(void) void ro_gui_window_quit(void) { - struct gui_window *cur; - while (window_list) { - cur = window_list; + struct gui_window *cur = window_list; window_list = window_list->next; browser_window_destroy(cur->bw); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c01e168d64fd3f4c05d... commit c01e168d64fd3f4c05d5bb64b2f2e4d47ef940e4 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Scope reduce a couple of variables. diff --git a/riscos/url_suggest.c b/riscos/url_suggest.c index 71d63c0..c01fdec 100644 --- a/riscos/url_suggest.c +++ b/riscos/url_suggest.c @@ -89,7 +89,6 @@ bool ro_gui_url_suggest_get_menu_available(void) bool ro_gui_url_suggest_prepare_menu(void) { - int i; struct url_suggest_item *list, *next; /* Fetch the URLs we want to include from URLdb. */ @@ -108,7 +107,7 @@ bool ro_gui_url_suggest_prepare_menu(void) assert(suggest_entries <= URL_SUGGEST_MAX_URLS); if (suggest_entries > 0) { - i = suggest_entries; + int i = suggest_entries; list = suggest_list; suggest_list = NULL; @@ -156,7 +155,7 @@ bool ro_gui_url_suggest_callback(nsurl *url, const struct url_data *data) { int count; unsigned int weight; - struct url_suggest_item **list, *new, *old; + struct url_suggest_item **list, *new; /* Ignore unvisited URLs, and those that don't apply to HTML or Text. */ @@ -206,7 +205,7 @@ bool ro_gui_url_suggest_callback(nsurl *url, const struct url_data *data) */ while (suggest_list != NULL && suggest_entries > URL_SUGGEST_MAX_URLS) { - old = suggest_list; + struct url_suggest_item *old = suggest_list; suggest_list = suggest_list->next; free(old); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=dcf9eca7b3b4f42f40d... commit dcf9eca7b3b4f42f40d9610595f9fcaea0370cfc Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Visits is unsigned, so can't be less than 0. diff --git a/riscos/url_suggest.c b/riscos/url_suggest.c index 32e772c..71d63c0 100644 --- a/riscos/url_suggest.c +++ b/riscos/url_suggest.c @@ -160,7 +160,7 @@ bool ro_gui_url_suggest_callback(nsurl *url, const struct url_data *data) /* Ignore unvisited URLs, and those that don't apply to HTML or Text. */ - if (data->visits <= 0 || (data->type != CONTENT_HTML && + if (data->visits == 0 || (data->type != CONTENT_HTML && data->type != CONTENT_TEXTPLAIN)) return true; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=8ee941a7a52d795b601... commit 8ee941a7a52d795b601fdded34918cd2eafbda41 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Scope reduce several variables. diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 4a5d2d5..889d1da 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -96,7 +96,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) wimp_window_state state; char *match_url; const char *url; - int i, lines; + int i; int old_selection; int height; os_error *error; @@ -144,7 +144,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) (strcmp(match_url, url_complete_matched_string))) { /* memorize the current matches */ - lines = MAXIMUM_VISIBLE_LINES; + int lines = MAXIMUM_VISIBLE_LINES; if (lines > url_complete_matches_available) lines = url_complete_matches_available; if (url_complete_matches) { @@ -528,8 +528,7 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw) { osbool more; os_error *error; - int clip_y0, clip_y1, origin_y; - int first_line, last_line, line; + int line; const struct url_data *data; int type; @@ -564,9 +563,10 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw) /* redraw */ more = wimp_redraw_window(redraw); while (more) { - origin_y = redraw->box.y1 - redraw->yscroll; - clip_y0 = redraw->clip.y0 - origin_y; - clip_y1 = redraw->clip.y1 - origin_y; + int first_line, last_line; + int origin_y = redraw->box.y1 - redraw->yscroll; + int clip_y0 = redraw->clip.y0 - origin_y; + int clip_y1 = redraw->clip.y1 - origin_y; first_line = (-clip_y1) / 44; last_line = (-clip_y0 + 43) / 44; @@ -656,9 +656,8 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer) { wimp_window_state state; os_error *error; - int selection, old_selection; + int selection; struct gui_window *g; - const char *url; if ((mouse_x == pointer->pos.x) && (mouse_y == pointer->pos.y) && (!pointer->buttons)) @@ -678,7 +677,11 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer) selection = (state.visible.y1 - pointer->pos.y - state.yscroll) / 44; if (selection != url_complete_matches_selection) { + int old_selection; + if (url_complete_matches_selection == -1) { + const char *url; + g = ro_gui_window_lookup(url_complete_parent); if (!g) return false; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=bbb002ee1da7655f94f... commit bbb002ee1da7655f94ffb607db5e3b7c108d53ba Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Scope reduce some variables. diff --git a/riscos/treeview.c b/riscos/treeview.c index 0c16626..d33704c 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -427,7 +427,6 @@ void ro_treeview_scroll(wimp_scroll *scroll) void ro_treeview_redraw_loop(wimp_draw *redraw, ro_treeview *tv, osbool more) { - os_error *error; struct redraw_context ctx = { .interactive = true, .background_images = true, @@ -435,6 +434,7 @@ void ro_treeview_redraw_loop(wimp_draw *redraw, ro_treeview *tv, osbool more) }; while (more) { + os_error *error; if (tv != NULL && tv->tree != NULL) { struct rect clip; @@ -611,7 +611,6 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) wimp_window_state state; int new_x, new_y; int visible_x, visible_y; - int new_x_scroll, new_y_scroll; /* Calculate the new window extents, in RISC OS units. */ @@ -658,8 +657,8 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) if ((state.flags & wimp_WINDOW_OPEN) && (visible_x > new_x || visible_y < new_y)) { - new_x_scroll = state.xscroll; - new_y_scroll = state.yscroll; + int new_x_scroll = state.xscroll; + int new_y_scroll = state.yscroll; if (visible_x > new_x) new_x_scroll = new_x - (state.visible.x1 commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ecee6ffad8d11f16c63... commit ecee6ffad8d11f16c63ee99309110c5ef7c349a2 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove dead code. diff --git a/riscos/toolbar.c b/riscos/toolbar.c index 5bbde8a..bd76e23 100644 --- a/riscos/toolbar.c +++ b/riscos/toolbar.c @@ -593,8 +593,6 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat) wimp_window_state state; os_box extent; int old_height, old_width; - int xeig, yeig; - os_coord pixel = {1, 1}; if (!toolbar) return false; @@ -602,12 +600,6 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat) old_height = toolbar->current_height; old_width = toolbar->current_width; - /* calculate 1px in OS units */ - - ro_convert_pixels_to_os_units(&pixel, (os_mode)-1); - xeig = pixel.x; - yeig = pixel.y; - /* Measure the parent window width if the caller has asked us to * calculate the clip width ourselves. Otherwise, if a clip width * has been specified, set the clip to that. commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=33513e65eae324f5187... commit 33513e65eae324f51875d11e88154c9c294cf3b8 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Fix toolbar width calculation. + has greater precedence than ?:, so wrap :? part in (). diff --git a/riscos/toolbar.c b/riscos/toolbar.c index 3a6c0d6..5bbde8a 100644 --- a/riscos/toolbar.c +++ b/riscos/toolbar.c @@ -847,8 +847,8 @@ void ro_toolbar_refresh_widget_dimensions(struct toolbar *toolbar) toolbar->full_height = 0; } toolbar->full_width = 2 * TOOLBAR_WIDGET_GUTTER + - (row_width > toolbar->editor_size.x) ? - row_width : toolbar->editor_size.x; + ((row_width > toolbar->editor_size.x) ? + row_width : toolbar->editor_size.x); } commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=2f02d0785a4abd6977c... commit 2f02d0785a4abd6977cd5716a33c604377703d5d Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Scope reduce a variable. diff --git a/riscos/toolbar.c b/riscos/toolbar.c index d64db2d..3a6c0d6 100644 --- a/riscos/toolbar.c +++ b/riscos/toolbar.c @@ -1774,8 +1774,6 @@ bool ro_toolbar_get_editing(struct toolbar *toolbar) bool ro_toolbar_toggle_edit(struct toolbar *toolbar) { - char *new_buttons; - if (toolbar == NULL || toolbar->editor == NULL) return false; @@ -1799,6 +1797,7 @@ bool ro_toolbar_toggle_edit(struct toolbar *toolbar) if (!toolbar->editing && toolbar->buttons != NULL && toolbar->callbacks != NULL && toolbar->callbacks->save_buttons != NULL) { + char *new_buttons; new_buttons = ro_gui_button_bar_get_config(toolbar->buttons); toolbar->callbacks->save_buttons(toolbar->client_data, new_buttons); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=55b3163520197148556... commit 55b3163520197148556aeb8ea2e7f779d54b0dc5 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Reduce scope of a variable. diff --git a/riscos/thumbnail.c b/riscos/thumbnail.c index 6686455..2bdd372 100644 --- a/riscos/thumbnail.c +++ b/riscos/thumbnail.c @@ -85,7 +85,6 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap, struct thumbnail_save_area *save_area; osspriteop_area *sprite_area = NULL; osspriteop_header *sprite_header = NULL; - _kernel_oserror *error; struct redraw_context ctx = { .interactive = false, .background_images = true, @@ -137,6 +136,8 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap, /* if we changed to 8bpp then go back to 32bpp */ if (thumbnail_32bpp_available != 1) { const uint8_t *pixbufp = bitmap_get_buffer(bitmap); + _kernel_oserror *error; + if (!pixbufp || !bitmap->sprite_area) { free(sprite_area); return false; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=259a02a72a9ffec44a5... commit 259a02a72a9ffec44a5216cbe0ce1506d05d5b93 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Scope reduce some variables. diff --git a/riscos/theme_install.c b/riscos/theme_install.c index 598b55d..09e9bd4 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -84,15 +84,14 @@ void theme_install_start(hlcache_handle *c) nserror theme_install_callback(hlcache_handle *handle, const hlcache_event *event, void *pw) { - char buffer[256]; - int author_indent = 0; - switch (event->type) { case CONTENT_MSG_DONE: { const char *source_data; unsigned long source_size; + int author_indent = 0; + char buffer[256]; theme_install_content = handle; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=f313635e2158a32de7c... commit f313635e2158a32de7cf558146015a05c1de27bc Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Reduce scope of a variable. diff --git a/riscos/theme.c b/riscos/theme.c index f1b7ae2..a12ed92 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -176,11 +176,10 @@ static void ro_gui_theme_get_available_in_dir(const char *directory) int context = 0; int read_count; osgbpb_INFO(100) info; - os_error *error; while (context != -1) { /* read some directory info */ - error = xosgbpb_dir_entries_info(directory, + os_error *error = xosgbpb_dir_entries_info(directory, (osgbpb_info_list *) &info, 1, context, sizeof(info), 0, &read_count, &context); if (error) { commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0b39a3750c20463a1a4... commit 0b39a3750c20463a1a4d8e4b5a62caeb72464cf8 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Reduce scope of a few variables. diff --git a/riscos/textselection.c b/riscos/textselection.c index 5215a62..2c85204 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -392,9 +392,6 @@ bool ro_gui_selection_prepare_paste_dataload( wimp_full_message_data_xfer *dataxfer) { FILE *fp; - long size; - char *local_cb; - nserror ret; /* Ignore messages that aren't for us */ if (dataxfer->your_ref == 0 || dataxfer->your_ref != paste_prev_message) @@ -402,13 +399,15 @@ bool ro_gui_selection_prepare_paste_dataload( fp = fopen(dataxfer->file_name, "r"); if (fp != NULL) { + long size; fseek(fp, 0, SEEK_END); size = ftell(fp); fseek(fp, 0, SEEK_SET); if (size > 0) { - local_cb = malloc(size); + char *local_cb = malloc(size); if (local_cb != NULL) { + nserror ret; fread(local_cb, 1, size, fp); ret = utf8_from_local_encoding(local_cb, size, commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ef8b0e82044df2b62b4... commit ef8b0e82044df2b62b41abd3652565c1d5330cfe Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Reduce scope of several variables. diff --git a/riscos/textarea.c b/riscos/textarea.c index 57f7dd0..85c9ca3 100644 --- a/riscos/textarea.c +++ b/riscos/textarea.c @@ -909,11 +909,8 @@ bool ro_textarea_key_press(wimp_key *key) uint32_t c = (uint32_t) key->c; wimp_key keypress; struct text_area *ta; - char utf8[7]; - size_t utf8_len; bool redraw = false; unsigned int c_pos; - os_error *error; ta = (struct text_area *)ro_gui_wimp_event_get_user_data(key->w); @@ -923,6 +920,9 @@ bool ro_textarea_key_press(wimp_key *key) if (!(c & IS_WIMP_KEY || (c <= 0x001f || (0x007f <= c && c <= 0x009f)))) { /* normal character - insert */ + char utf8[7]; + size_t utf8_len; + utf8_len = utf8_from_ucs4(c, utf8); utf8[utf8_len] = '\0'; @@ -932,6 +932,7 @@ bool ro_textarea_key_press(wimp_key *key) redraw = true; } else { + os_error *error; /** \todo handle command keys */ switch (c & ~IS_WIMP_KEY) { case 8: /* Backspace */ @@ -1065,8 +1066,7 @@ void ro_textarea_redraw(wimp_draw *redraw) void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) { struct text_area *ta; - int clip_y0, clip_y1; - int line0, line1, line; + int line; osbool more; rufl_code code; os_error *error; @@ -1084,6 +1084,8 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) } while (more) { + int line0, line1; + int clip_y0, clip_y1; clip_y0 = (redraw->box.y1-redraw->yscroll) - redraw->clip.y1; clip_y1 = (redraw->box.y1-redraw->yscroll) - redraw->clip.y0; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=dca506dfe4a38b66259... commit dca506dfe4a38b66259c554979a64d025615e836 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove unused variables, and dead code. diff --git a/riscos/textarea.c b/riscos/textarea.c index 86774fa..57f7dd0 100644 --- a/riscos/textarea.c +++ b/riscos/textarea.c @@ -1065,7 +1065,7 @@ void ro_textarea_redraw(wimp_draw *redraw) void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) { struct text_area *ta; - int clip_x0, clip_y0, clip_x1, clip_y1; + int clip_y0, clip_y1; int line0, line1, line; osbool more; rufl_code code; @@ -1084,9 +1084,7 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) } while (more) { - clip_x0 = redraw->clip.x0 - (redraw->box.x0-redraw->xscroll); clip_y0 = (redraw->box.y1-redraw->yscroll) - redraw->clip.y1; - clip_x1 = redraw->clip.x1 - (redraw->box.x0-redraw->xscroll); clip_y1 = (redraw->box.y1-redraw->yscroll) - redraw->clip.y0; error = xcolourtrans_set_gcol( commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ae0e1316b773686c24d... commit ae0e1316b773686c24d14b428cee80a4e9ed3bad Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove unused struct search_static_data members. diff --git a/riscos/search.c b/riscos/search.c index 230edc2..0c4e6af 100644 --- a/riscos/search.c +++ b/riscos/search.c @@ -48,12 +48,10 @@ struct search_static_data { char *recent_searches[RECENT_SEARCHES]; bool search_insert; struct browser_window *search_window; - search_flags_t flags; - char *string; }; static struct search_static_data search_data = - {{NULL}, false, NULL, 0, NULL}; + { { NULL }, false, NULL }; static wimp_MENU(RECENT_SEARCHES) menu_recent; wimp_menu *recent_search_menu = (wimp_menu *)&menu_recent; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=bab90eddda91c6eeff7... commit bab90eddda91c6eeff7452e73be3d7949aac51d3 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Use angle brackets instead of quotes for include of external headers. diff --git a/riscos/gui.h b/riscos/gui.h index 0ee426b..8f849ae 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -23,9 +23,10 @@ #include <stdbool.h> #include <stdlib.h> -#include "oslib/osspriteop.h" -#include "oslib/wimp.h" -#include "rufl.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" commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4fbe86bc5a87d98adb4... commit 4fbe86bc5a87d98adb49da85685d5c097bd91452 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Scope reduce some variables. diff --git a/riscos/schedule.c b/riscos/schedule.c index 6788811..286bdef 100644 --- a/riscos/schedule.c +++ b/riscos/schedule.c @@ -129,13 +129,14 @@ nserror riscos_schedule(int t, void (*callback)(void *p), void *p) bool schedule_run(void) { struct sched_entry *entry; - void (*callback)(void *p); - void *p; os_t now; now = os_read_monotonic_time(); while (sched_queue.next && sched_queue.next->time <= now) { + void (*callback)(void *p); + void *p; + entry = sched_queue.next; callback = entry->callback; p = entry->p; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3ce61d6950f5c079914... commit 3ce61d6950f5c07991468f1ec4bb1f4915cb60e8 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Reduce scope of a couple of variables. diff --git a/riscos/save.c b/riscos/save.c index c3eed17..bc7918c 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -618,7 +618,6 @@ static void ro_gui_save_drag_end(wimp_dragged *drag, void *data) os_error *error; char *dp, *ep; char *local_name = NULL; - nserror err; if (dragbox_active) ro_gui_drag_box_cancel(); @@ -654,6 +653,7 @@ static void ro_gui_save_drag_end(wimp_dragged *drag, void *data) if (!saving_from_dialog) { /* saving directly from browser window, choose a * name based upon the URL */ + nserror err; err = utf8_to_local_encoding(save_leafname, 0, &local_name); if (err != NSERROR_OK) { /* badenc should never happen */ @@ -1222,7 +1222,6 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type, char *nice = NULL; nserror err; char *local_name; - size_t i; assert(icon_len >= 13); @@ -1252,6 +1251,7 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type, /* leafname */ if (url && url_nice(url, &nice, nsoption_bool(strip_extensions)) == NSERROR_OK) { + size_t i; for (i = 0; nice[i]; i++) { if (nice[i] == '.') nice[i] = '/'; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4ea90d2dcabdb6949dc... commit 4ea90d2dcabdb6949dca1d8f8700004df1478599 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Check correct variable for NULL. diff --git a/riscos/gui.c b/riscos/gui.c index f3d1f32..691264d 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -927,8 +927,8 @@ static void gui_init2(int argc, char** argv) /* URL files */ else if (strcasecmp(argv[1], "-urlf") == 0) { char *urlf = ro_gui_url_file_parse(argv[2]); - if (!url) { - LOG(("malloc failed")); + if (!urlf) { + LOG(("allocation failed")); die("Insufficient memory for URL"); } ret = nsurl_create(urlf, &url); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d0e67542f54647fd1e0... commit d0e67542f54647fd1e02f5aca3f1e3f6bb0ccec2 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Reduce scope of a variable. diff --git a/riscos/download.c b/riscos/download.c index f1410f6..6109d69 100644 --- a/riscos/download.c +++ b/riscos/download.c @@ -857,7 +857,6 @@ bool ro_gui_download_click(wimp_pointer *pointer) ro_gui_drag_icon(x, y, sprite); } else if (pointer->i == ICON_DOWNLOAD_DESTINATION) { - os_error *error; char command[256] = "Filer_OpenDir "; char *dot; @@ -865,6 +864,7 @@ bool ro_gui_download_click(wimp_pointer *pointer) command[255] = 0; dot = strrchr(command, '.'); if (dot) { + os_error *error; *dot = 0; error = xos_cli(command); if (error) { commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d25b62f1c2de187aded... commit d25b62f1c2de187adedf782bae19e1e2eb86eb54 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Avoid redundant assignement of name to name. diff --git a/riscos/save.c b/riscos/save.c index 749cc59..c3eed17 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -1280,7 +1280,8 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type, local_name = NULL; } - name = local_name ? local_name : name; + if (local_name != NULL) + name = local_name; /* sprite name used for icon and dragging */ if (save_type == GUI_SAVE_COMPLETE) { ----------------------------------------------------------------------- Summary of changes: riscos/download.c | 2 +- riscos/gui.c | 4 +- riscos/gui.h | 7 ++-- riscos/save.c | 7 ++-- riscos/schedule.c | 5 ++- riscos/search.c | 4 +-- riscos/textarea.c | 14 ++++---- riscos/textselection.c | 7 ++-- riscos/theme.c | 3 +- riscos/theme_install.c | 5 +-- riscos/thumbnail.c | 3 +- riscos/toolbar.c | 15 ++------- riscos/treeview.c | 7 ++-- riscos/url_complete.c | 21 +++++++----- riscos/url_suggest.c | 9 ++--- riscos/wimp_event.c | 20 ++++++------ riscos/window.c | 79 +++++++++++++++++++++++------------------------ 17 files changed, 101 insertions(+), 111 deletions(-) diff --git a/riscos/download.c b/riscos/download.c index f1410f6..6109d69 100644 --- a/riscos/download.c +++ b/riscos/download.c @@ -857,7 +857,6 @@ bool ro_gui_download_click(wimp_pointer *pointer) ro_gui_drag_icon(x, y, sprite); } else if (pointer->i == ICON_DOWNLOAD_DESTINATION) { - os_error *error; char command[256] = "Filer_OpenDir "; char *dot; @@ -865,6 +864,7 @@ bool ro_gui_download_click(wimp_pointer *pointer) command[255] = 0; dot = strrchr(command, '.'); if (dot) { + os_error *error; *dot = 0; error = xos_cli(command); if (error) { diff --git a/riscos/gui.c b/riscos/gui.c index f3d1f32..691264d 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -927,8 +927,8 @@ static void gui_init2(int argc, char** argv) /* URL files */ else if (strcasecmp(argv[1], "-urlf") == 0) { char *urlf = ro_gui_url_file_parse(argv[2]); - if (!url) { - LOG(("malloc failed")); + if (!urlf) { + LOG(("allocation failed")); die("Insufficient memory for URL"); } ret = nsurl_create(urlf, &url); diff --git a/riscos/gui.h b/riscos/gui.h index 0ee426b..8f849ae 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -23,9 +23,10 @@ #include <stdbool.h> #include <stdlib.h> -#include "oslib/osspriteop.h" -#include "oslib/wimp.h" -#include "rufl.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" diff --git a/riscos/save.c b/riscos/save.c index 749cc59..bc7918c 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -618,7 +618,6 @@ static void ro_gui_save_drag_end(wimp_dragged *drag, void *data) os_error *error; char *dp, *ep; char *local_name = NULL; - nserror err; if (dragbox_active) ro_gui_drag_box_cancel(); @@ -654,6 +653,7 @@ static void ro_gui_save_drag_end(wimp_dragged *drag, void *data) if (!saving_from_dialog) { /* saving directly from browser window, choose a * name based upon the URL */ + nserror err; err = utf8_to_local_encoding(save_leafname, 0, &local_name); if (err != NSERROR_OK) { /* badenc should never happen */ @@ -1222,7 +1222,6 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type, char *nice = NULL; nserror err; char *local_name; - size_t i; assert(icon_len >= 13); @@ -1252,6 +1251,7 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type, /* leafname */ if (url && url_nice(url, &nice, nsoption_bool(strip_extensions)) == NSERROR_OK) { + size_t i; for (i = 0; nice[i]; i++) { if (nice[i] == '.') nice[i] = '/'; @@ -1280,7 +1280,8 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type, local_name = NULL; } - name = local_name ? local_name : name; + if (local_name != NULL) + name = local_name; /* sprite name used for icon and dragging */ if (save_type == GUI_SAVE_COMPLETE) { diff --git a/riscos/schedule.c b/riscos/schedule.c index 6788811..286bdef 100644 --- a/riscos/schedule.c +++ b/riscos/schedule.c @@ -129,13 +129,14 @@ nserror riscos_schedule(int t, void (*callback)(void *p), void *p) bool schedule_run(void) { struct sched_entry *entry; - void (*callback)(void *p); - void *p; os_t now; now = os_read_monotonic_time(); while (sched_queue.next && sched_queue.next->time <= now) { + void (*callback)(void *p); + void *p; + entry = sched_queue.next; callback = entry->callback; p = entry->p; diff --git a/riscos/search.c b/riscos/search.c index 230edc2..0c4e6af 100644 --- a/riscos/search.c +++ b/riscos/search.c @@ -48,12 +48,10 @@ struct search_static_data { char *recent_searches[RECENT_SEARCHES]; bool search_insert; struct browser_window *search_window; - search_flags_t flags; - char *string; }; static struct search_static_data search_data = - {{NULL}, false, NULL, 0, NULL}; + { { NULL }, false, NULL }; static wimp_MENU(RECENT_SEARCHES) menu_recent; wimp_menu *recent_search_menu = (wimp_menu *)&menu_recent; diff --git a/riscos/textarea.c b/riscos/textarea.c index 86774fa..85c9ca3 100644 --- a/riscos/textarea.c +++ b/riscos/textarea.c @@ -909,11 +909,8 @@ bool ro_textarea_key_press(wimp_key *key) uint32_t c = (uint32_t) key->c; wimp_key keypress; struct text_area *ta; - char utf8[7]; - size_t utf8_len; bool redraw = false; unsigned int c_pos; - os_error *error; ta = (struct text_area *)ro_gui_wimp_event_get_user_data(key->w); @@ -923,6 +920,9 @@ bool ro_textarea_key_press(wimp_key *key) if (!(c & IS_WIMP_KEY || (c <= 0x001f || (0x007f <= c && c <= 0x009f)))) { /* normal character - insert */ + char utf8[7]; + size_t utf8_len; + utf8_len = utf8_from_ucs4(c, utf8); utf8[utf8_len] = '\0'; @@ -932,6 +932,7 @@ bool ro_textarea_key_press(wimp_key *key) redraw = true; } else { + os_error *error; /** \todo handle command keys */ switch (c & ~IS_WIMP_KEY) { case 8: /* Backspace */ @@ -1065,8 +1066,7 @@ void ro_textarea_redraw(wimp_draw *redraw) void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) { struct text_area *ta; - int clip_x0, clip_y0, clip_x1, clip_y1; - int line0, line1, line; + int line; osbool more; rufl_code code; os_error *error; @@ -1084,9 +1084,9 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) } while (more) { - clip_x0 = redraw->clip.x0 - (redraw->box.x0-redraw->xscroll); + int line0, line1; + int clip_y0, clip_y1; clip_y0 = (redraw->box.y1-redraw->yscroll) - redraw->clip.y1; - clip_x1 = redraw->clip.x1 - (redraw->box.x0-redraw->xscroll); clip_y1 = (redraw->box.y1-redraw->yscroll) - redraw->clip.y0; error = xcolourtrans_set_gcol( diff --git a/riscos/textselection.c b/riscos/textselection.c index 5215a62..2c85204 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -392,9 +392,6 @@ bool ro_gui_selection_prepare_paste_dataload( wimp_full_message_data_xfer *dataxfer) { FILE *fp; - long size; - char *local_cb; - nserror ret; /* Ignore messages that aren't for us */ if (dataxfer->your_ref == 0 || dataxfer->your_ref != paste_prev_message) @@ -402,13 +399,15 @@ bool ro_gui_selection_prepare_paste_dataload( fp = fopen(dataxfer->file_name, "r"); if (fp != NULL) { + long size; fseek(fp, 0, SEEK_END); size = ftell(fp); fseek(fp, 0, SEEK_SET); if (size > 0) { - local_cb = malloc(size); + char *local_cb = malloc(size); if (local_cb != NULL) { + nserror ret; fread(local_cb, 1, size, fp); ret = utf8_from_local_encoding(local_cb, size, diff --git a/riscos/theme.c b/riscos/theme.c index f1b7ae2..a12ed92 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -176,11 +176,10 @@ static void ro_gui_theme_get_available_in_dir(const char *directory) int context = 0; int read_count; osgbpb_INFO(100) info; - os_error *error; while (context != -1) { /* read some directory info */ - error = xosgbpb_dir_entries_info(directory, + os_error *error = xosgbpb_dir_entries_info(directory, (osgbpb_info_list *) &info, 1, context, sizeof(info), 0, &read_count, &context); if (error) { diff --git a/riscos/theme_install.c b/riscos/theme_install.c index 598b55d..09e9bd4 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -84,15 +84,14 @@ void theme_install_start(hlcache_handle *c) nserror theme_install_callback(hlcache_handle *handle, const hlcache_event *event, void *pw) { - char buffer[256]; - int author_indent = 0; - switch (event->type) { case CONTENT_MSG_DONE: { const char *source_data; unsigned long source_size; + int author_indent = 0; + char buffer[256]; theme_install_content = handle; diff --git a/riscos/thumbnail.c b/riscos/thumbnail.c index 6686455..2bdd372 100644 --- a/riscos/thumbnail.c +++ b/riscos/thumbnail.c @@ -85,7 +85,6 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap, struct thumbnail_save_area *save_area; osspriteop_area *sprite_area = NULL; osspriteop_header *sprite_header = NULL; - _kernel_oserror *error; struct redraw_context ctx = { .interactive = false, .background_images = true, @@ -137,6 +136,8 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap, /* if we changed to 8bpp then go back to 32bpp */ if (thumbnail_32bpp_available != 1) { const uint8_t *pixbufp = bitmap_get_buffer(bitmap); + _kernel_oserror *error; + if (!pixbufp || !bitmap->sprite_area) { free(sprite_area); return false; diff --git a/riscos/toolbar.c b/riscos/toolbar.c index d64db2d..bd76e23 100644 --- a/riscos/toolbar.c +++ b/riscos/toolbar.c @@ -593,8 +593,6 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat) wimp_window_state state; os_box extent; int old_height, old_width; - int xeig, yeig; - os_coord pixel = {1, 1}; if (!toolbar) return false; @@ -602,12 +600,6 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat) old_height = toolbar->current_height; old_width = toolbar->current_width; - /* calculate 1px in OS units */ - - ro_convert_pixels_to_os_units(&pixel, (os_mode)-1); - xeig = pixel.x; - yeig = pixel.y; - /* Measure the parent window width if the caller has asked us to * calculate the clip width ourselves. Otherwise, if a clip width * has been specified, set the clip to that. @@ -847,8 +839,8 @@ void ro_toolbar_refresh_widget_dimensions(struct toolbar *toolbar) toolbar->full_height = 0; } toolbar->full_width = 2 * TOOLBAR_WIDGET_GUTTER + - (row_width > toolbar->editor_size.x) ? - row_width : toolbar->editor_size.x; + ((row_width > toolbar->editor_size.x) ? + row_width : toolbar->editor_size.x); } @@ -1774,8 +1766,6 @@ bool ro_toolbar_get_editing(struct toolbar *toolbar) bool ro_toolbar_toggle_edit(struct toolbar *toolbar) { - char *new_buttons; - if (toolbar == NULL || toolbar->editor == NULL) return false; @@ -1799,6 +1789,7 @@ bool ro_toolbar_toggle_edit(struct toolbar *toolbar) if (!toolbar->editing && toolbar->buttons != NULL && toolbar->callbacks != NULL && toolbar->callbacks->save_buttons != NULL) { + char *new_buttons; new_buttons = ro_gui_button_bar_get_config(toolbar->buttons); toolbar->callbacks->save_buttons(toolbar->client_data, new_buttons); diff --git a/riscos/treeview.c b/riscos/treeview.c index 0c16626..d33704c 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -427,7 +427,6 @@ void ro_treeview_scroll(wimp_scroll *scroll) void ro_treeview_redraw_loop(wimp_draw *redraw, ro_treeview *tv, osbool more) { - os_error *error; struct redraw_context ctx = { .interactive = true, .background_images = true, @@ -435,6 +434,7 @@ void ro_treeview_redraw_loop(wimp_draw *redraw, ro_treeview *tv, osbool more) }; while (more) { + os_error *error; if (tv != NULL && tv->tree != NULL) { struct rect clip; @@ -611,7 +611,6 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) wimp_window_state state; int new_x, new_y; int visible_x, visible_y; - int new_x_scroll, new_y_scroll; /* Calculate the new window extents, in RISC OS units. */ @@ -658,8 +657,8 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) if ((state.flags & wimp_WINDOW_OPEN) && (visible_x > new_x || visible_y < new_y)) { - new_x_scroll = state.xscroll; - new_y_scroll = state.yscroll; + int new_x_scroll = state.xscroll; + int new_y_scroll = state.yscroll; if (visible_x > new_x) new_x_scroll = new_x - (state.visible.x1 diff --git a/riscos/url_complete.c b/riscos/url_complete.c index 4a5d2d5..889d1da 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -96,7 +96,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) wimp_window_state state; char *match_url; const char *url; - int i, lines; + int i; int old_selection; int height; os_error *error; @@ -144,7 +144,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) (strcmp(match_url, url_complete_matched_string))) { /* memorize the current matches */ - lines = MAXIMUM_VISIBLE_LINES; + int lines = MAXIMUM_VISIBLE_LINES; if (lines > url_complete_matches_available) lines = url_complete_matches_available; if (url_complete_matches) { @@ -528,8 +528,7 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw) { osbool more; os_error *error; - int clip_y0, clip_y1, origin_y; - int first_line, last_line, line; + int line; const struct url_data *data; int type; @@ -564,9 +563,10 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw) /* redraw */ more = wimp_redraw_window(redraw); while (more) { - origin_y = redraw->box.y1 - redraw->yscroll; - clip_y0 = redraw->clip.y0 - origin_y; - clip_y1 = redraw->clip.y1 - origin_y; + int first_line, last_line; + int origin_y = redraw->box.y1 - redraw->yscroll; + int clip_y0 = redraw->clip.y0 - origin_y; + int clip_y1 = redraw->clip.y1 - origin_y; first_line = (-clip_y1) / 44; last_line = (-clip_y0 + 43) / 44; @@ -656,9 +656,8 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer) { wimp_window_state state; os_error *error; - int selection, old_selection; + int selection; struct gui_window *g; - const char *url; if ((mouse_x == pointer->pos.x) && (mouse_y == pointer->pos.y) && (!pointer->buttons)) @@ -678,7 +677,11 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer) selection = (state.visible.y1 - pointer->pos.y - state.yscroll) / 44; if (selection != url_complete_matches_selection) { + int old_selection; + if (url_complete_matches_selection == -1) { + const char *url; + g = ro_gui_window_lookup(url_complete_parent); if (!g) return false; diff --git a/riscos/url_suggest.c b/riscos/url_suggest.c index 32e772c..c01fdec 100644 --- a/riscos/url_suggest.c +++ b/riscos/url_suggest.c @@ -89,7 +89,6 @@ bool ro_gui_url_suggest_get_menu_available(void) bool ro_gui_url_suggest_prepare_menu(void) { - int i; struct url_suggest_item *list, *next; /* Fetch the URLs we want to include from URLdb. */ @@ -108,7 +107,7 @@ bool ro_gui_url_suggest_prepare_menu(void) assert(suggest_entries <= URL_SUGGEST_MAX_URLS); if (suggest_entries > 0) { - i = suggest_entries; + int i = suggest_entries; list = suggest_list; suggest_list = NULL; @@ -156,11 +155,11 @@ bool ro_gui_url_suggest_callback(nsurl *url, const struct url_data *data) { int count; unsigned int weight; - struct url_suggest_item **list, *new, *old; + struct url_suggest_item **list, *new; /* Ignore unvisited URLs, and those that don't apply to HTML or Text. */ - if (data->visits <= 0 || (data->type != CONTENT_HTML && + if (data->visits == 0 || (data->type != CONTENT_HTML && data->type != CONTENT_TEXTPLAIN)) return true; @@ -206,7 +205,7 @@ bool ro_gui_url_suggest_callback(nsurl *url, const struct url_data *data) */ while (suggest_list != NULL && suggest_entries > URL_SUGGEST_MAX_URLS) { - old = suggest_list; + struct url_suggest_item *old = suggest_list; suggest_list = suggest_list->next; free(old); diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c index d048b9a..d42d2b0 100644 --- a/riscos/wimp_event.c +++ b/riscos/wimp_event.c @@ -634,7 +634,6 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) int current, step, stepping, min, max, decimal_places; wimp_window_state open; wimp_caret caret; - os_error *error; bool prepared; w = pointer->w; @@ -702,6 +701,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) * button, then close the menu (which closes us) and then finally * re-open ourselves. ugh! */ if (current_menu != NULL) { + os_error *error; open.w = pointer->w; error = xwimp_get_window_state(&open); if (error) { @@ -1163,25 +1163,25 @@ bool ro_gui_wimp_event_pointer_entering_window(wimp_entering *entering) bool ro_gui_wimp_event_process_window_menu_click(wimp_pointer *pointer) { struct event_window *window; - int xpos, ypos, line_height, gap_height, entry; window = ro_gui_wimp_event_find_window(pointer->w); if ((window) && (window->window_menu) && (pointer->buttons == wimp_CLICK_MENU)) { + int xpos, ypos; + if (window->menu_prepare) if (!window->menu_prepare(window->w, wimp_ICON_WINDOW, window->window_menu, pointer)) return false; if (window->window_menu_iconbar) { - xpos = pointer->pos.x; - ypos = 96; - - line_height = window->window_menu->height + + int entry = 0; + int line_height = window->window_menu->height + window->window_menu->gap; - gap_height = 24; /* The fixed dotted line height */ + int gap_height = 24; /* The fixed dotted line height */ - entry = 0; + xpos = pointer->pos.x; + ypos = 96; do { ypos += line_height; if ((window->window_menu-> @@ -1340,7 +1340,6 @@ bool ro_gui_wimp_event_register_checkbox(wimp_w w, wimp_i i) bool ro_gui_wimp_event_register_radio(wimp_w w, wimp_i *i) { struct event_window *window; - struct icon_event *event; window = ro_gui_wimp_event_get_window(w); if (!window) @@ -1348,7 +1347,8 @@ bool ro_gui_wimp_event_register_radio(wimp_w w, wimp_i *i) window->max_radio_group++; while (*i != -1) { - event = ro_gui_wimp_event_get_event(w, *i, EVENT_RADIO); + struct icon_event *event = ro_gui_wimp_event_get_event(w, *i, + EVENT_RADIO); if (!event) return false; event->data.radio_group = window->max_radio_group; diff --git a/riscos/window.c b/riscos/window.c index 0c95e5b..876ad0e 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -412,7 +412,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw, struct gui_window *existing, gui_window_create_flags flags) { - int screen_width, screen_height, win_width, win_height, scroll_width; + int screen_width, screen_height; static int window_count = 2; wimp_window window; wimp_window_state state; @@ -451,19 +451,24 @@ static struct gui_window *gui_window_create(struct browser_window *bw, window.visible.y1 = state.visible.y1 - 48; open_centred = false; } else { + int win_width, win_height; ro_gui_screen_size(&screen_width, &screen_height); /* Check if we have a preferred position */ if ((nsoption_int(window_screen_width) != 0) && (nsoption_int(window_screen_height) != 0)) { - win_width = (nsoption_int(window_width) * screen_width) / - nsoption_int(window_screen_width); - win_height = (nsoption_int(window_height) * screen_height) / - nsoption_int(window_screen_height); - window.visible.x0 = (nsoption_int(window_x) * screen_width) / - nsoption_int(window_screen_width); - window.visible.y0 = (nsoption_int(window_y) * screen_height) / - nsoption_int(window_screen_height); + win_width = (nsoption_int(window_width) * + screen_width) / + nsoption_int(window_screen_width); + win_height = (nsoption_int(window_height) * + screen_height) / + nsoption_int(window_screen_height); + window.visible.x0 = (nsoption_int(window_x) * + screen_width) / + nsoption_int(window_screen_width); + window.visible.y0 = (nsoption_int(window_y) * + screen_height) / + nsoption_int(window_screen_height); if (nsoption_bool(window_stagger)) { window.visible.y0 += 96 - (48 * (window_count % 5)); @@ -535,7 +540,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw, wimp_WINDOW_TOGGLE_ICON; if (open_centred) { - scroll_width = ro_get_vscroll_width(NULL); + int scroll_width = ro_get_vscroll_width(NULL); window.visible.x0 -= scroll_width; } @@ -684,13 +689,12 @@ static void gui_window_destroy(struct gui_window *g) static void gui_window_set_title(struct gui_window *g, const char *title) { - int scale_disp; - assert(g); assert(title); if (g->bw->scale != 1.0) { - scale_disp = g->bw->scale * 100; + int scale_disp = g->bw->scale * 100; + if (ABS((float)scale_disp - g->bw->scale * 100) >= 0.05) snprintf(g->title, sizeof g->title, "%s (%.1f%%)", title, g->bw->scale * 100); @@ -972,7 +976,6 @@ static void gui_window_update_extent(struct gui_window *g) wimp_window_state state; bool update; unsigned int flags; - int scroll = 0; assert(g); @@ -987,7 +990,7 @@ static void gui_window_update_extent(struct gui_window *g) /* scroll on toolbar height change */ if (g->toolbar) { - scroll = ro_toolbar_height(g->toolbar) - info.extent.y1; + int scroll = ro_toolbar_height(g->toolbar) - info.extent.y1; info.yscroll += scroll; } @@ -1246,13 +1249,12 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type, const struct rect *rect) { wimp_pointer pointer; - os_error *error; wimp_drag drag; if (rect != NULL) { /* We have a box to constrain the pointer to, for the drag * duration */ - error = xwimp_get_pointer_info(&pointer); + os_error *error = xwimp_get_pointer_info(&pointer); if (error) { LOG(("xwimp_get_pointer_info 0x%x : %s", error->errnum, error->errmess)); @@ -1505,8 +1507,7 @@ void ro_gui_window_open(wimp_open *open) struct gui_window *g = (struct gui_window *)ro_gui_wimp_event_get_user_data(open->w); int width = open->visible.x1 - open->visible.x0; int height = open->visible.y1 - open->visible.y0; - int size, fheight, fwidth, toolbar_height = 0; - bool no_vscroll, no_hscroll; + int toolbar_height = 0; float new_scale = 0; hlcache_handle *h; wimp_window_state state; @@ -1546,17 +1547,16 @@ void ro_gui_window_open(wimp_open *open) /* handle 'auto' scroll bars' and non-fitting scrollbar removal */ if ((g->bw->scrolling == SCROLLING_AUTO) || (g->bw->scrolling == SCROLLING_YES)) { + int size; + /* windows lose scrollbars when containing a frameset */ - no_hscroll = false; - no_vscroll = g->bw->children; + bool no_hscroll = false; + bool no_vscroll = g->bw->children; /* hscroll */ size = ro_get_hscroll_height(NULL); if (g->bw->border) size -= 2; - fheight = height; - if (state.flags & wimp_WINDOW_HSCROLL) - fheight += size; if (!no_hscroll) { if (!(state.flags & wimp_WINDOW_HSCROLL)) { height -= size; @@ -1583,9 +1583,6 @@ void ro_gui_window_open(wimp_open *open) size = ro_get_vscroll_width(NULL); if (g->bw->border) size -= 2; - fwidth = width; - if (state.flags & wimp_WINDOW_VSCROLL) - fwidth += size; if (!no_vscroll) { if (!(state.flags & wimp_WINDOW_VSCROLL)) { width -= size; @@ -1673,7 +1670,7 @@ void ro_gui_window_close(wimp_w w) struct gui_window *g = (struct gui_window *)ro_gui_wimp_event_get_user_data(w); wimp_pointer pointer; os_error *error; - char *temp_name, *r; + char *temp_name; char *filename = NULL; hlcache_handle *h = NULL; bool destroy; @@ -1697,6 +1694,7 @@ void ro_gui_window_close(wimp_w w) if (filename != NULL) { temp_name = malloc(strlen(filename) + 32); if (temp_name) { + char *r; sprintf(temp_name, "Filer_OpenDir %s", filename); r = temp_name + strlen(temp_name); @@ -1894,13 +1892,11 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, os_error *ro_error; wimp_pointer pointer; os_coord pos; - const char *toolbar_url; float scale; uint32_t c = (uint32_t) key->c; wimp_scroll_direction xscroll = wimp_SCROLL_NONE; wimp_scroll_direction yscroll = wimp_SCROLL_NONE; nsurl *url; - nserror error; if (g == NULL) return false; @@ -1924,7 +1920,9 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, switch (c) { case IS_WIMP_KEY + wimp_KEY_F1: /* Help. */ { - error = nsurl_create("http://www.netsurf-browser.org/documentation/", &url); + nserror error = nsurl_create( + "http://www.netsurf-browser.org/documentation/", + &url); if (error == NSERROR_OK) { error = browser_window_create(BW_CREATE_HISTORY, url, @@ -2032,6 +2030,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, case wimp_KEY_RETURN: if (is_toolbar) { + const char *toolbar_url; toolbar_url = ro_toolbar_get_url(g->toolbar); if (toolbar_url != NULL) ro_gui_window_launch_url(g, toolbar_url); @@ -3590,7 +3589,6 @@ void ro_gui_window_toolbar_click(void *data, { struct gui_window *g = data; struct browser_window *new_bw; - gui_save_type save_type; if (g == NULL) return; @@ -3599,6 +3597,9 @@ void ro_gui_window_toolbar_click(void *data, if (action_type == TOOLBAR_ACTION_URL) { switch (action.url) { case TOOLBAR_URL_DRAG_URL: + { + gui_save_type save_type; + if (g->bw->current_content == NULL) break; @@ -3612,6 +3613,7 @@ void ro_gui_window_toolbar_click(void *data, ro_gui_drag_save_link(save_type, nsurl_access(hlcache_handle_get_url(h)), content_get_title(h), g); + } break; case TOOLBAR_URL_SELECT_HOTLIST: @@ -3862,10 +3864,9 @@ bool ro_gui_window_up_available(struct browser_window *bw) { bool result = false; nsurl *parent; - nserror err; if (bw != NULL && bw->current_content != NULL) { - err = nsurl_parent(hlcache_handle_get_url( + nserror err = nsurl_parent(hlcache_handle_get_url( bw->current_content), &parent); if (err == NSERROR_OK) { result = nsurl_compare(hlcache_handle_get_url( @@ -3890,7 +3891,6 @@ void ro_gui_window_prepare_pageinfo(struct gui_window *g) hlcache_handle *h = g->bw->current_content; char icon_buf[20] = "file_xxx"; char enc_buf[40]; - char enc_token[10] = "Encoding0"; const char *icon = icon_buf; const char *title, *url; lwc_string *mime; @@ -3912,6 +3912,7 @@ void ro_gui_window_prepare_pageinfo(struct gui_window *g) if (content_get_type(h) == CONTENT_HTML) { if (html_get_encoding(h)) { + char enc_token[10] = "Encoding0"; enc_token[8] = '0' + html_get_encoding_source(h); snprintf(enc_buf, sizeof enc_buf, "%s (%s)", html_get_encoding(h), @@ -3991,13 +3992,13 @@ void ro_gui_window_prepare_objectinfo(hlcache_handle *object, const char *href) void ro_gui_window_launch_url(struct gui_window *g, const char *url1) { char *url2; /** @todo The risc os maintainer needs to examine why the url is copied here */ - nsurl *url; - nserror error; ro_gui_url_complete_close(); url2 = strdup(url1); if (url2 != NULL) { + nserror error; + nsurl *url; gui_window_set_url(g, url2); @@ -4408,10 +4409,8 @@ void ro_gui_window_process_reformats(void) void ro_gui_window_quit(void) { - struct gui_window *cur; - while (window_list) { - cur = window_list; + struct gui_window *cur = window_list; window_list = window_list->next; browser_window_destroy(cur->bw); -- NetSurf Browser

8 years, 9 months

1
0
0 / 0

libdom: branch rupindersingh/libdom updated. release/0.1.0-34-gfe77e7e

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/fe77e7eef56e4ccf592334... ...commit http://git.netsurf-browser.org/libdom.git/commit/fe77e7eef56e4ccf59233469... ...tree http://git.netsurf-browser.org/libdom.git/tree/fe77e7eef56e4ccf592334697c... The branch, rupindersingh/libdom has been updated via fe77e7eef56e4ccf592334697ca5d8eeee784111 (commit) from b0397d143831758f0f3d641f8eef81774ee1c4fa (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=fe77e7eef56e4ccf5923... commit fe77e7eef56e4ccf592334697ca5d8eeee784111 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 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..3af9c9d 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_table_caption_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_table_section_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_table_section_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_table_row_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..94b090e 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_table_row_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 3f067bc..f646143 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..4d16bb3 100644 --- a/src/html/html_table_element.c +++ b/src/html/html_table_element.c @@ -3,5 +3,736 @@ * 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_table_caption_element **caption) +{ + dom_exception exp; + if((exp = dom_html_table_element_get_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, + 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 = *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_table_section_element **t_foot) +{ + dom_exception exp; + exp = dom_html_table_element_get_t_foot(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, + 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 = *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_table_section_element **t_head) +{ + dom_html_table_element_get_t_head(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, + 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 = *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; + int32_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_table_row_element **row) +{ + dom_exception exp; + dom_html_collection* rows; + int32_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, + row); + if(exp != DOM_NO_ERR) { + return exp; + } + + if(index > 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 = len; + } + dom_html_collection* rows; + dom_html_table_section_element *t_head; + dom_html_table_section_element *t_foot; + int32_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 > 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 >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 > 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; + int32_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 >= len || index < -1 || len ==0) { + return DOM_INDEX_SIZE_ERR; + } else { + if(index ==-1) { + index = len-1; + } + dom_html_collection* rows; + dom_html_table_section_element *t_head; + dom_html_table_section_element *t_foot; + int32_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 > 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 >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 > 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..bcc4e91 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; + 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; + } + } + + 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]))) { + int32_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 = 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 index, dom_html_element **cell) { + dom_html_document *doc = (dom_html_document *) ((dom_node_internal *) element)->owner; + + dom_node *node; /*< The node at the (index)th position*/ + + dom_html_collection *cells; /*< The collection of cells in input table_row_element*/ + int32_t len; /*< The size of the cell collection */ + dom_exception exp; /*< Variable for getting the exceptions*/ + exp = _dom_html_element_create(doc, doc->memoised[hds_TD], + ((dom_node_internal *)element)->namespace, + ((dom_node_internal *)element)->prefix, + cell); + if(exp != DOM_NO_ERR) + return exp; + + exp = dom_html_table_row_element_get_cells(element, &cells); + if(exp != DOM_NO_ERR) + return exp; + + exp = dom_html_collection_get_length(cells, &len); + if(exp != DOM_NO_ERR) + return exp; + + if(index < -1 || index > len) { + /* Check for index validity */ + return DOM_INDEX_SIZE_ERR; + } else if(index == -1 || index == len) { + return _dom_node_append_child((dom_node_internal *)element, + (dom_node_internal *)*cell, + (dom_node_internal **)cell); + } else { + dom_html_collection_item(cells, + index, &node); + return _dom_node_insert_before((dom_node_internal *)element, + (dom_node_internal *)*cell, (dom_node_internal *)node, + (dom_node_internal **)cell); + } +} + +/** + * Delete Cell at given Index + * + * \param element The dom_html_table_row_element object + * \param index The Index of the Cell node to be deleted + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_table_row_element_delete_cell( + dom_html_table_row_element *element, + int32_t index) { + dom_node *node; /*< The node at the (index)th position*/ + + dom_html_collection *cells; /*< The collection of rows in input table_row_element*/ + int32_t len; /*< The size of the row collection */ + + dom_exception exp; /*< Temporary variable to store & check the exceptions*/ + + exp = dom_html_table_row_element_get_cells(element, &cells); + if(exp != DOM_NO_ERR) { + return exp; + } + + exp = dom_html_collection_get_length(cells, &len); + if(exp != DOM_NO_ERR) { + return exp; + } + + if(index < -1 || index >= len || len ==0) { + /* Check for index validity */ + return DOM_INDEX_SIZE_ERR; + } else if(index == -1) { + exp = dom_html_collection_item(cells, + len-1, &node); + } else { + exp = dom_html_collection_item(cells, + index, &node); + } + return _dom_node_remove_child((dom_node_internal *)element, + (dom_node_internal *)node, + (dom_node_internal **)&node); + +} + diff --git a/src/html/html_tablerow_element.h b/src/html/html_tablerow_element.h index 2e182d5..2401790 100644 --- a/src/html/html_tablerow_element.h +++ b/src/html/html_tablerow_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_table_row_element_h_ +#define dom_internal_html_table_row_element_h_ + +#include <dom/html/html_tablerow_element.h> +#include "html/html_element.h" + +struct dom_html_table_row_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_table_row_element object */ +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); + +/* Initialise a dom_html_table_row_element object */ +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); + +/* Finalise a dom_html_table_row_element object */ +void _dom_html_table_row_element_finalise(struct dom_html_table_row_element *ele); + +/* Destroy a dom_html_table_row_element object */ +void _dom_html_table_row_element_destroy(struct dom_html_table_row_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_table_row_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_table_row_element_destroy(dom_node_internal *node); +dom_exception _dom_html_table_row_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_TABLE_ROW_ELEMENT_PROTECT_VTABLE \ + _dom_html_table_row_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_TABLE_ROW_ELEMENT \ + _dom_virtual_html_table_row_element_destroy, \ + _dom_html_table_row_element_copy + +#endif +bool table_cells_callback(struct dom_node_internal *node, void *ctx); + diff --git a/src/html/html_tablesection_element.c b/src/html/html_tablesection_element.c index 2d65693..5563405 100644 --- a/src/html/html_tablesection_element.c +++ b/src/html/html_tablesection_element.c @@ -12,6 +12,7 @@ #include "html/html_document.h" #include "html/html_tablesection_element.h" +#include "html/html_tablerow_element.h" #include "html/html_collection.h" #include "html/html_element.h" @@ -169,8 +170,7 @@ bool table_section_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])) - { + ((dom_html_document *)ctx)->memoised[hds_TR])) { return true; } return false; @@ -179,7 +179,7 @@ bool table_section_callback(struct dom_node_internal *node, void *ctx) /** * Get the rows collection * - * \param element The dom_html_section_element object + * \param element The dom_html_table_section_element object * \param rows The Status * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ @@ -188,21 +188,20 @@ dom_exception dom_html_table_section_element_get_rows( dom_html_collection **rows) { dom_html_document *doc = (dom_html_document *) ((dom_node_internal *) element)->owner; - _dom_html_collection_create(doc, (dom_node_internal *)element, + return _dom_html_collection_create(doc, (dom_node_internal *)element, table_section_callback, (void *)doc, rows); - return DOM_NO_ERR; } /** * Insert Row before the given Index * - * \param element The dom_html_section_element object + * \param element The dom_html_table_section_element object * \param index The Index of the Row node to be inserted * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ 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_table_row_element **new_row) { dom_html_document *doc = (dom_html_document *) ((dom_node_internal *) element)->owner; dom_node *node; /*< The node at the (index)th position*/ @@ -210,10 +209,10 @@ dom_exception dom_html_table_section_element_insert_row( dom_html_collection *rows; /*< The collection of rows in input table_section_element*/ int32_t len; /*< The size of the row collection */ dom_exception exp; /*< Variable for getting the exceptions*/ - exp = _dom_html_element_create(doc, doc->memoised[hds_TR], + exp = _dom_html_table_row_element_create(doc, ((dom_node_internal *)element)->namespace, ((dom_node_internal *)element)->prefix, - newRow); + new_row); if(exp != DOM_NO_ERR) return exp; @@ -228,44 +227,23 @@ dom_exception dom_html_table_section_element_insert_row( if(index < -1 || index > len) { /* Check for index validity */ return DOM_INDEX_SIZE_ERR; - } else if((index == -1 || index == len) - &&len != 0) { - dom_html_collection_item(rows, - len-1, &node); - - dom_node_internal *internal_node = (dom_node_internal *)node; /*< The dom_node_internal row object at the (len-1)th position*/ - - ((dom_node_internal *) *newRow)->next = internal_node->next; - ((dom_node_internal *) *newRow)->previous = internal_node; - internal_node->next = (dom_node_internal *)*newRow; - } else if(len != 0) { + } else if(index == -1 || index == len) { + return _dom_node_append_child((dom_node_internal *)element, + (dom_node_internal *)*new_row, + (dom_node_internal **)new_row); + } else { dom_html_collection_item(rows, index, &node); - - dom_node_internal *internal_node = (dom_node_internal *)node; /*< The dom_node_internal row object at the (index)th position*/ - - ((dom_node_internal *) *newRow)->next = internal_node; - ((dom_node_internal *) *newRow)->previous = internal_node->previous; - if(internal_node->previous != NULL) { - (internal_node->previous)->next = (dom_node_internal *)*newRow; - internal_node->previous = (dom_node_internal *)*newRow; - } + return _dom_node_insert_before((dom_node_internal *)element, + (dom_node_internal *)*new_row, (dom_node_internal *)node, + (dom_node_internal **)new_row); } - - /*Adjust parent's pointers*/ - ((dom_node_internal *) *newRow)->parent = (dom_node_internal *)element; - if(index == 0) - ((dom_node_internal *)element)->first_child = (dom_node_internal *)*newRow; - if(index == len) - ((dom_node_internal *)element)->last_child = (dom_node_internal *)*newRow; - - return DOM_NO_ERR; } /** * Delete Row at given Index * - * \param element The dom_html_section_element object + * \param element The dom_html_table_section_element object * \param index The Index of the Row node to be deleted * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ @@ -289,7 +267,7 @@ dom_exception dom_html_table_section_element_delete_row( return exp; } - if(index < -1 || index >= len) { + if(index < -1 || index >= len || len ==0) { /* Check for index validity */ return DOM_INDEX_SIZE_ERR; } else if(index == -1) { @@ -299,20 +277,9 @@ dom_exception dom_html_table_section_element_delete_row( exp = dom_html_collection_item(rows, index, &node); } - if(exp != DOM_NO_ERR) - return exp; - - dom_node_internal *internal_node = (dom_node_internal *)node; - - /*Fixing the sibling pointers*/ - if(internal_node->previous != NULL) { - (internal_node->previous)->next = internal_node->next; - } - if(internal_node->next != NULL) { - (internal_node->next)->previous = internal_node->previous; - } - - _dom_html_element_destroy(internal_node); + exp = _dom_node_remove_child((dom_node_internal *)element, + (dom_node_internal *)node, + (dom_node_internal **)&node); return DOM_NO_ERR; } diff --git a/src/html/html_tablesection_element.h b/src/html/html_tablesection_element.h index fcab1cb..387882a 100644 --- a/src/html/html_tablesection_element.h +++ b/src/html/html_tablesection_element.h @@ -10,8 +10,8 @@ #define dom_internal_html_table_section_element_h_ #include <dom/html/html_tablesection_element.h> -#include "html/html_element.h" +#include "html/html_element.h" struct dom_html_table_section_element { struct dom_html_element base; diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 78d5e7e..b69312c 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -44,6 +44,10 @@ our %special_type = ( CDATASection => "dom_cdata_section *", HTMLAnchorElement => "dom_html_anchor_element *", HTMLElement => "dom_html_element *", + HTMLTableCaptionElement => "dom_html_table_caption_element *", + HTMLTableSectionElement => "dom_html_table_section_element *", + HTMLTableElement => "dom_html_table_element *", + HTMLTableRowElement => "dom_html_table_row_element *", ); our %special_prefix = ( DOMString => "dom_string", @@ -57,6 +61,18 @@ our %special_prefix = ( HTMLHRElement => "dom_html_hr_element", HTMLBRElement => "dom_html_br_element", HTMLLIElement => "dom_html_li_element", + HTMLTableCaptionElement => "dom_html_table_caption_element", + HTMLTableSectionElement => "dom_html_table_section_element", + caption => "dom_html_table_caption_element *", + section => "dom_html_table_section_element *", + createCaption => "dom_html_table_caption_element *", + createTHead => "dom_html_table_section_element *", + createTFoot => "dom_html_table_section_element *", + deleteCaption => "dom_html_table_caption_element *", + deleteTHead => "dom_html_table_section_element *", + deleteTFoot => "dom_html_table_section_element *", + insertRow => "dom_html_table_row_element *", + deleteRow => "dom_html_table_row_element *", ); our %unref_prefix = ( @@ -164,10 +180,14 @@ sub new { # The name of the current List/Collection list_name => "", # The number of items of the current List/Collection + list_last_name => [], + # The number of items of the current List/Collection list_num => 0, # Whether List/Collection has members list_hasmem => 0, # The type of the current List/Collection + member_list_declared => 0, + # The type of the current List/Collection list_type => "", # Whether we are in exception assertion exception => 0, @@ -389,6 +409,7 @@ int main(int argc, char **argv) perror("chdir (\\"$self->{chdir})\\""); return 1; } + int list_temp[100], count = -1; __EOF__ } @@ -442,7 +463,6 @@ sub generate_list { # Yes, we are in List/Collection declaration # Firstly, enclose the Array declaration print "};\n"; - # Now, we should create the list * for the List/Collection # Note, we should deal with "int" or "string" type with different params. if ($self->{"list_type"} eq "char *") { @@ -450,18 +470,37 @@ sub generate_list { } if ($self->{"list_type"} eq "int *") { print $self->{"list_name"}." = list_new(INT);\n"; + while(defined ($x = pop @{$self->{"list_last_name"}})) { + print $x." = list_new(INT);\n"; + } } + while(defined($x = pop(@{$self->{"list_last_name"}}))) { + print $x." = list_new(DOM_STRING);\n"; + } + $self->{"member_list_declared"} = 1; if ($self->{"list_type"} eq "") { die "A List/Collection has children member but no type is impossible!"; } - for (my $i = 0; $i < $self->{"list_num"}; $i++) { - # Use *(char **) to convert char *[] to char * - print "list_add(".$self->{"list_name"}.", *(char **)(".$self->{"list_name"}."Array + $i));\n"; + if ($self->{"list_type"} eq "int *") { + + for (my $i = 0; $i < $self->{"list_num"}; $i++) { + # Use *(char **) to convert char *[] to char * + print "list_add(".$self->{"list_name"}.", (int *)(".$self->{"list_name"}."Array) + $i);\n"; + } + } else { + for (my $i = 0; $i < $self->{"list_num"}; $i++) { + # Use *(char **) to convert char *[] to char * + print "list_add(".$self->{"list_name"}.", *(char **)(".$self->{"list_name"}."Array + $i));\n"; + } } } else { if ($self->{"list_name"} ne "") { #TODO: generally, we set the list type as dom_string, but it may be dom_node - print $self->{"list_name"}." = list_new(DOM_STRING);\n"; + if( $self->{"member_list_declared"} eq 1) { + print $self->{"list_name"}." = list_new(DOM_STRING);\n"; + } else { + push(@{$self->{"list_last_name"}}, $self->{"list_name"}); + } $self->{"list_type"} = "DOMString"; } } @@ -553,14 +592,19 @@ sub generate_framework_statement { if (exists $ats->{"obj"}) { $obj = $ats->{"obj"}; } else { - $obj = $ats->{"item"} + $obj = $ats->{"item"}; } - + if (not $self->{"var"}->{$col} =~ /^(List|Collection)/) { die "Append data to some non-list type!"; } - - print "list_add($col, $obj);\n"; + $type = $self->{"var"}->{$obj}; + if ($type eq "int") { + print "\nlist_temp[++count] =$obj;\n"; + print "list_add($col, &list_temp[count]);\n\n"; + } else { + print "list_add($col, $obj);\n"; + } } case [qw(plus subtract mult divide)] { @@ -681,6 +725,8 @@ 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 $ns = $dd->find("parameters/param", $node); my $params = "${cast}$ats{'obj'}"; for ($count = 1; $count <= $ns->size; $count++) { @@ -746,7 +792,7 @@ sub generate_method { # Indicate that we have created a temp node $temp_node = 1; } else { - $params = $params.", (void *) \&$ats{'var'}"; + $params = $params.", $cast_get_attribute\&$ats{'var'}"; $unref = $self->param_unref($ats{'var'}); } } @@ -808,6 +854,8 @@ 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 $unref = 0; my $temp_node = 0; # Deal with the situation like @@ -833,7 +881,7 @@ sub generate_attribute_fetcher { $temp_node = 1; } else { $unref = $self->param_unref($ats{'var'}); - print "\texp = $fetcher(${cast}$ats{'obj'}, \&$ats{'var'});\n"; + print "\texp = $fetcher(${cast}$ats{'obj'}, ${cast_get_attribute}\&$ats{'var'});\n"; } @@ -1424,7 +1472,26 @@ sub get_prefix { } return $prefix; } +sub to_get_attribute_cast { + my $type = shift; + my $ret = get_get_attribute_prefix($type); + if($ret eq "") { + return $ret; + } + $ret =~ s/h_t_m_l/html/; + return "(${ret} *)"; +} +sub get_get_attribute_prefix { + my $type = shift; + + if (exists $special_prefix{$type}) { + $prefix = $special_prefix{$type}; + } else { + $prefix = ""; + } + return $prefix; +} # This function remain unsed sub get_suffix { my $type = shift; diff --git a/test/testcases/tests/level1/html/.HTMLTableElement24.xml.swp b/test/testcases/tests/level1/html/.HTMLTableElement24.xml.swp new file mode 100644 index 0000000..08c4591 Binary files /dev/null and b/test/testcases/tests/level1/html/.HTMLTableElement24.xml.swp differ diff --git a/test/testcases/tests/level1/html/.HTMLTableElement28.xml.swp b/test/testcases/tests/level1/html/.HTMLTableElement28.xml.swp new file mode 100644 index 0000000..f717eac Binary files /dev/null and b/test/testcases/tests/level1/html/.HTMLTableElement28.xml.swp differ diff --git a/test/testcases/tests/level1/html/HTMLCollection01.xml.notimpl b/test/testcases/tests/level1/html/HTMLCollection01.xml.notimpl deleted file mode 100644 index fd2cfe4..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection01.xml.notimpl +++ /dev/null @@ -1,49 +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="HTMLCollection01"> -<metadata> -<title>HTMLCollection01</title> -<creator>NIST</creator> -<description> - An individual node may be accessed by either ordinal index, the node's - name or id attributes. (Test ordinal index). - - Retrieve the first TABLE element and create a HTMLCollection by invoking - the "rows" attribute. The item located at ordinal index 0 is further - retrieved and its "rowIndex" attribute is examined. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrowindex" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="0"/> -<rowIndex interface="HTMLTableRowElement" obj="rowNode" var="vrowindex"/> -<assertEquals actual="vrowindex" expected="0" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection02.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection02.xml.kfail deleted file mode 100644 index 521d5ae..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection02.xml.kfail +++ /dev/null @@ -1,49 +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="HTMLCollection02"> -<metadata> -<title>HTMLCollection02</title> -<creator>NIST</creator> -<description> - An individual node may be accessed by either ordinal index, the node's - name or id attributes. (Test node name). - - Retrieve the first FORM element and create a HTMLCollection by invoking - the elements attribute. The first SELECT element is further retrieved - using the elements name attribute. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7672..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="formNode" type="Node"/> -<var name="formsnodeList" type="HTMLCollection"/> -<var name="vname" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> -<namedItem obj="formsnodeList" var="formNode" name='"select1"'/> -<nodeName obj="formNode" var="vname"/> -<assertEquals actual="vname" expected='"SELECT"' id="nameIndexLink" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection03.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection03.xml.kfail deleted file mode 100644 index 36d489e..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection03.xml.kfail +++ /dev/null @@ -1,49 +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="HTMLCollection03"> -<metadata> -<title>HTMLCollection03</title> -<creator>NIST</creator> -<description> - An individual node may be accessed by either ordinal index, the node's - name or id attributes. (Test id attribute). - - Retrieve the first FORM element and create a HTMLCollection by invoking - the "element" attribute. The first SELECT element is further retrieved - using the elements id. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2106..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="formNode" type="Node"/> -<var name="formsnodeList" type="HTMLCollection"/> -<var name="vname" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> -<namedItem obj="formsnodeList" var="formNode" name='"selectId"'/> -<nodeName obj="formNode" var="vname"/> -<assertEquals actual="vname" expected='"select"' id="nameIndexLink" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection04.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection04.xml.kfail new file mode 100644 index 0000000..5d78405 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection04.xml.kfail @@ -0,0 +1,59 @@ +<?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="HTMLCollection04"> +<metadata> +<title>HTMLCollection04</title> +<creator>NIST</creator> +<description> + HTMLCollections are live, they are automatically updated when the + underlying document is changed. + + Create a HTMLCollection object by invoking the rows attribute of the + first TABLE element and examine its length, then add a new row and + re-examine the length. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4005..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowLength1" type="int"/> +<var name="rowLength2" type="int"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="newRow" type="HTMLElement"/> +<var name="vrowindex" type="int" /> +<var name="doc" type="Document"/> +<var name="result" type="List"/> +<var name="expectedResult" type="List"> +<member>4</member> +<member>5</member> +</var> +<load var="doc" href="collection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength1"/> +<append collection="result" item="rowLength1"/> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="4"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength2"/> +<append collection="result" item="rowLength2"/> +<assertEquals actual="result" expected="expectedResult" id="rowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection05.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection05.xml.kfail new file mode 100644 index 0000000..ffb7d13 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection05.xml.kfail @@ -0,0 +1,46 @@ +<?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="HTMLCollection05"> +<metadata> +<title>HTMLCollection05</title> +<creator>NIST</creator> +<description> + The length attribute specifies the length or size of the list. + + Retrieve the first TABLE element and create a HTMLCollection by invoking + the "rows" attribute. Retrieve the length attribute of the HTMLCollection + object. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4005..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="rowLength" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength"/> +<assertEquals actual="rowLength" expected="4" id="rowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection09.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection09.xml.kfail new file mode 100644 index 0000000..f81e7af --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection09.xml.kfail @@ -0,0 +1,47 @@ +<?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="HTMLCollection09"> +<metadata> +<title>HTMLCollection09</title> +<creator>NIST</creator> +<description> + The item(index) method returns null if the index is out of range. + + Retrieve the first TABLE element and create a HTMLCollection by invoking + the "rows" attribute. Invoke the item(index) method with an index + of 5. This index is out of range and should return null. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrowindex" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="5"/> +<assertNull actual="rowNode" id="rowIndexLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection12.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection12.xml.kfail new file mode 100644 index 0000000..d7feb3d --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection12.xml.kfail @@ -0,0 +1,50 @@ +<?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="HTMLCollection12"> +<metadata> +<title>HTMLCollection12</title> +<creator>NIST</creator> +<description> + The namedItem(name) method retrieves a node using a name. It first + searches for a node with a matching id attribute. If it doesn't find + one, it then searches for a Node with a matching name attribute, but only + on those elements that are allowed a name attribute. If there isn't + a matching node the method returns null. + + Retrieve the first FORM element and create a HTMLCollection by invoking + the elements attribute. The method returns null since there is not a + match of the name or id attribute. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2106..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="formNode" type="Node"/> +<var name="formsnodeList" type="HTMLCollection"/> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> +<namedItem obj="formsnodeList" var="formNode" name='"select9"'/> +<assertNull actual="formNode" id="nameIndexLink" /> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement01.xml b/test/testcases/tests/level1/html/HTMLTableElement01.xml new file mode 100644 index 0000000..7135fd7 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement01.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="HTMLTableElement01"> +<metadata> +<title>HTMLTableElement01</title> +<creator>NIST</creator> +<description> + The caption attribute returns the tables CAPTION. + + Retrieve the align attribute of the CAPTION element from the second + TABLE 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-1459..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcaption" type="HTMLTableCaptionElement" /> +<var name="valign" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> +<align interface="HTMLTableCaptionElement" obj="vcaption" var="valign"/> +<assertEquals actual="valign" expected='"top"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement01.xml.kfail deleted file mode 100644 index 7135fd7..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement01.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="HTMLTableElement01"> -<metadata> -<title>HTMLTableElement01</title> -<creator>NIST</creator> -<description> - The caption attribute returns the tables CAPTION. - - Retrieve the align attribute of the CAPTION element from the second - TABLE 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-1459..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcaption" type="HTMLTableCaptionElement" /> -<var name="valign" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> -<align interface="HTMLTableCaptionElement" obj="vcaption" var="valign"/> -<assertEquals actual="valign" expected='"top"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement02.xml b/test/testcases/tests/level1/html/HTMLTableElement02.xml new file mode 100644 index 0000000..fb9fa8f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement02.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="HTMLTableElement02"> +<metadata> +<title>HTMLTableElement02</title> +<creator>NIST</creator> +<description> + The caption attribute returns the tables CAPTION or void if it does not + exist. + + Retrieve the CAPTION element from within the first TABLE element. + Since one does not exist it should be void. +</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-1459..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcaption" type="HTMLTableCaptionElement" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> +<assertNull actual="vcaption" id="captionLink" /> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement02.xml.kfail deleted file mode 100644 index fb9fa8f..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement02.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="HTMLTableElement02"> -<metadata> -<title>HTMLTableElement02</title> -<creator>NIST</creator> -<description> - The caption attribute returns the tables CAPTION or void if it does not - exist. - - Retrieve the CAPTION element from within the first TABLE element. - Since one does not exist it should be void. -</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-1459..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcaption" type="HTMLTableCaptionElement" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> -<assertNull actual="vcaption" id="captionLink" /> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement03.xml b/test/testcases/tests/level1/html/HTMLTableElement03.xml new file mode 100644 index 0000000..0b59fe6 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement03.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="HTMLTableElement03"> +<metadata> +<title>HTMLTableElement03</title> +<creator>NIST</creator> +<description> + The tHead attribute returns the tables THEAD. + + Retrieve the align attribute of the THEAD element from the second + TABLE 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-9530944"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="valign" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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="vsection"/> +<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement03.xml.kfail deleted file mode 100644 index 0b59fe6..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement03.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="HTMLTableElement03"> -<metadata> -<title>HTMLTableElement03</title> -<creator>NIST</creator> -<description> - The tHead attribute returns the tables THEAD. - - Retrieve the align attribute of the THEAD element from the second - TABLE 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-9530944"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="valign" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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="vsection"/> -<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement04.xml b/test/testcases/tests/level1/html/HTMLTableElement04.xml new file mode 100644 index 0000000..1e254b3 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement04.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="HTMLTableElement04"> +<metadata> +<title>HTMLTableElement04</title> +<creator>NIST</creator> +<description> + The tHead attribute returns the tables THEAD or null if it does not + exist. + + Retrieve the THEAD element from within the first TABLE element. + Since one does not exist it should be null. +</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-9530944"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> +<assertNull actual="vsection" id="sectionLink" /> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement04.xml.kfail deleted file mode 100644 index 1e254b3..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement04.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="HTMLTableElement04"> -<metadata> -<title>HTMLTableElement04</title> -<creator>NIST</creator> -<description> - The tHead attribute returns the tables THEAD or null if it does not - exist. - - Retrieve the THEAD element from within the first TABLE element. - Since one does not exist it should be null. -</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-9530944"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> -<assertNull actual="vsection" id="sectionLink" /> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement05.xml b/test/testcases/tests/level1/html/HTMLTableElement05.xml new file mode 100644 index 0000000..15de11c --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement05.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="HTMLTableElement05"> +<metadata> +<title>HTMLTableElement05</title> +<creator>NIST</creator> +<description> + The tFoot attribute returns the tables TFOOT. + + Retrieve the align attribute of the TFOOT element from the second + TABLE 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-6419..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="valign" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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="vsection"/> +<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement05.xml.kfail deleted file mode 100644 index 15de11c..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement05.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="HTMLTableElement05"> -<metadata> -<title>HTMLTableElement05</title> -<creator>NIST</creator> -<description> - The tFoot attribute returns the tables TFOOT. - - Retrieve the align attribute of the TFOOT element from the second - TABLE 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-6419..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="valign" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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="vsection"/> -<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement06.xml b/test/testcases/tests/level1/html/HTMLTableElement06.xml new file mode 100644 index 0000000..e18b8f8 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement06.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="HTMLTableElement06"> +<metadata> +<title>HTMLTableElement06</title> +<creator>NIST</creator> +<description> + The tFoot attribute returns the tables TFOOT or null if it does not + exist. + + Retrieve the TFOOT element from within the first TABLE element. + Since one does not exist it should be null. +</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-6419..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> +<assertNull actual="vsection" id="sectionLink" /> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement06.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement06.xml.kfail deleted file mode 100644 index e18b8f8..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement06.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="HTMLTableElement06"> -<metadata> -<title>HTMLTableElement06</title> -<creator>NIST</creator> -<description> - The tFoot attribute returns the tables TFOOT or null if it does not - exist. - - Retrieve the TFOOT element from within the first TABLE element. - Since one does not exist it should be null. -</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-6419..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> -<assertNull actual="vsection" id="sectionLink" /> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement07.xml b/test/testcases/tests/level1/html/HTMLTableElement07.xml new file mode 100644 index 0000000..44be1c3 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement07.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="HTMLTableElement07"> +<metadata> +<title>HTMLTableElement07</title> +<creator>NIST</creator> +<description> + The rows attribute returns a collection of all the rows in the table, + including al in THEAD, TFOOT, all TBODY elements. + + Retrieve the rows attribute from the second TABLE element and + examine the items of the returned collection. +</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-6156016"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="rowName" type="DOMString"/> +<var name="vrow" type="Node"/> +<var name="result" type="List"/> +<var name="expectedOptions" type="List"> +<member>"tr"</member> +<member>"tr"</member> +<member>"tr"</member> +<member>"tr"</member> +</var> +<load var="doc" href="table" willBeModified="false"/> +<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="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<for-each collection="rowsnodeList" member="vrow"> +<nodeName obj="vrow" var="rowName"/> +<append collection="result" item="rowName"/> +</for-each> +<assertEquals actual="result" expected="expectedOptions" id="rowsLink" ignoreCase="auto"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement07.xml.kfail deleted file mode 100644 index 44be1c3..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement07.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="HTMLTableElement07"> -<metadata> -<title>HTMLTableElement07</title> -<creator>NIST</creator> -<description> - The rows attribute returns a collection of all the rows in the table, - including al in THEAD, TFOOT, all TBODY elements. - - Retrieve the rows attribute from the second TABLE element and - examine the items of the returned collection. -</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-6156016"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="rowName" type="DOMString"/> -<var name="vrow" type="Node"/> -<var name="result" type="List"/> -<var name="expectedOptions" type="List"> -<member>"tr"</member> -<member>"tr"</member> -<member>"tr"</member> -<member>"tr"</member> -</var> -<load var="doc" href="table" willBeModified="false"/> -<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="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<for-each collection="rowsnodeList" member="vrow"> -<nodeName obj="vrow" var="rowName"/> -<append collection="result" item="rowName"/> -</for-each> -<assertEquals actual="result" expected="expectedOptions" id="rowsLink" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement08.xml b/test/testcases/tests/level1/html/HTMLTableElement08.xml new file mode 100644 index 0000000..1a744b1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement08.xml @@ -0,0 +1,54 @@ +<?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="HTMLTableElement08"> +<metadata> +<title>HTMLTableElement08</title> +<creator>NIST</creator> +<description> + The tBodies attribute returns a collection of all the defined + table bodies. + + Retrieve the tBodies attribute from the second TABLE element and + examine the items of the returned collection. +</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-6320..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="tbodiesnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="tbodiesName" type="DOMString"/> +<var name="vtbodies" type="Node"/> +<var name="result" type="List"/> +<var name="expectedOptions" type="List"> +<member>"tbody"</member> +</var> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> +<for-each collection="tbodiesnodeList" member="vtbodies"> +<nodeName obj="vtbodies" var="tbodiesName"/> +<append collection="result" item="tbodiesName"/> +</for-each> +<assertEquals actual="result" expected="expectedOptions" id="tbodiesLink" ignoreCase="auto"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement08.xml.kfail deleted file mode 100644 index 1a744b1..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement08.xml.kfail +++ /dev/null @@ -1,54 +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="HTMLTableElement08"> -<metadata> -<title>HTMLTableElement08</title> -<creator>NIST</creator> -<description> - The tBodies attribute returns a collection of all the defined - table bodies. - - Retrieve the tBodies attribute from the second TABLE element and - examine the items of the returned collection. -</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-6320..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="tbodiesnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="tbodiesName" type="DOMString"/> -<var name="vtbodies" type="Node"/> -<var name="result" type="List"/> -<var name="expectedOptions" type="List"> -<member>"tbody"</member> -</var> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> -<for-each collection="tbodiesnodeList" member="vtbodies"> -<nodeName obj="vtbodies" var="tbodiesName"/> -<append collection="result" item="tbodiesName"/> -</for-each> -<assertEquals actual="result" expected="expectedOptions" id="tbodiesLink" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement09.xml b/test/testcases/tests/level1/html/HTMLTableElement09.xml new file mode 100644 index 0000000..a0aecf3 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement09.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="HTMLTableElement09"> +<metadata> +<title>HTMLTableElement09</title> +<creator>NIST</creator> +<description> + The tBodies attribute returns a collection of all the defined + table bodies. + + Retrieve the tBodies attribute from the third TABLE element and + examine the items of the returned collection. Tests multiple TBODY + elements. +</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-6320..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="tbodiesnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="tbodiesName" type="DOMString"/> +<var name="vtbodies" type="Node"/> +<var name="result" type="List"/> +<var name="expectedOptions" type="List"> +<member>"tbody"</member> +<member>"tbody"</member> +<member>"tbody"</member> +</var> +<load var="doc" href="table" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="2"/> +<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> +<for-each collection="tbodiesnodeList" member="vtbodies"> +<nodeName obj="vtbodies" var="tbodiesName"/> +<append collection="result" item="tbodiesName"/> +</for-each> +<assertEquals actual="result" expected="expectedOptions" id="tbodiesLink" ignoreCase="auto"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement09.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement09.xml.kfail deleted file mode 100644 index a0aecf3..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement09.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="HTMLTableElement09"> -<metadata> -<title>HTMLTableElement09</title> -<creator>NIST</creator> -<description> - The tBodies attribute returns a collection of all the defined - table bodies. - - Retrieve the tBodies attribute from the third TABLE element and - examine the items of the returned collection. Tests multiple TBODY - elements. -</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-6320..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="tbodiesnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="tbodiesName" type="DOMString"/> -<var name="vtbodies" type="Node"/> -<var name="result" type="List"/> -<var name="expectedOptions" type="List"> -<member>"tbody"</member> -<member>"tbody"</member> -<member>"tbody"</member> -</var> -<load var="doc" href="table" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="2"/> -<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> -<for-each collection="tbodiesnodeList" member="vtbodies"> -<nodeName obj="vtbodies" var="tbodiesName"/> -<append collection="result" item="tbodiesName"/> -</for-each> -<assertEquals actual="result" expected="expectedOptions" id="tbodiesLink" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement10.xml b/test/testcases/tests/level1/html/HTMLTableElement10.xml new file mode 100644 index 0000000..160afeb --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement10.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="HTMLTableElement10"> +<metadata> +<title>HTMLTableElement10</title> +<creator>NIST</creator> +<description> + The align attribute specifies the table's position with respect to the + rest of the document. + + Retrieve the align attribute of the first TABLE 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-2318..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="valign" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<align interface="HTMLTableElement" obj="testNode" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement10.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement10.xml.kfail deleted file mode 100644 index 160afeb..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement10.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="HTMLTableElement10"> -<metadata> -<title>HTMLTableElement10</title> -<creator>NIST</creator> -<description> - The align attribute specifies the table's position with respect to the - rest of the document. - - Retrieve the align attribute of the first TABLE 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-2318..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="valign" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<align interface="HTMLTableElement" obj="testNode" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement11.xml b/test/testcases/tests/level1/html/HTMLTableElement11.xml new file mode 100644 index 0000000..785c4d0 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement11.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="HTMLTableElement11"> +<metadata> +<title>HTMLTableElement11</title> +<creator>NIST</creator> +<description> + The bgColor attribute specifies cell background color. + + Retrieve the bgColor attribute of the first TABLE 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-8353..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vbgcolor" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<bgColor interface="HTMLTableElement" obj="testNode" var="vbgcolor"/> +<assertEquals actual="vbgcolor" expected='"#ff0000"' id="bgColorLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement11.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement11.xml.kfail deleted file mode 100644 index 785c4d0..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement11.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="HTMLTableElement11"> -<metadata> -<title>HTMLTableElement11</title> -<creator>NIST</creator> -<description> - The bgColor attribute specifies cell background color. - - Retrieve the bgColor attribute of the first TABLE 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-8353..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vbgcolor" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<bgColor interface="HTMLTableElement" obj="testNode" var="vbgcolor"/> -<assertEquals actual="vbgcolor" expected='"#ff0000"' id="bgColorLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement12.xml b/test/testcases/tests/level1/html/HTMLTableElement12.xml new file mode 100644 index 0000000..811a147 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement12.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="HTMLTableElement12"> +<metadata> +<title>HTMLTableElement12</title> +<creator>NIST</creator> +<description> + The border attribute specifies the width of the border around the table. + + Retrieve the border attribute of the first TABLE 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-5096..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vborder" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<border interface="HTMLTableElement" obj="testNode" var="vborder"/> +<assertEquals actual="vborder" expected='"4"' id="borderLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement12.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement12.xml.kfail deleted file mode 100644 index 811a147..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement12.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="HTMLTableElement12"> -<metadata> -<title>HTMLTableElement12</title> -<creator>NIST</creator> -<description> - The border attribute specifies the width of the border around the table. - - Retrieve the border attribute of the first TABLE 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-5096..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vborder" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<border interface="HTMLTableElement" obj="testNode" var="vborder"/> -<assertEquals actual="vborder" expected='"4"' id="borderLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement13.xml b/test/testcases/tests/level1/html/HTMLTableElement13.xml new file mode 100644 index 0000000..4a18d8d --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement13.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="HTMLTableElement13"> +<metadata> +<title>HTMLTableElement13</title> +<creator>NIST</creator> +<description> + The cellpadding attribute specifies the horizontal and vertical space + between cell content and cell borders. + + Retrieve the cellpadding attribute of the first TABLE 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-5916..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcellpadding" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<cellPadding interface="HTMLTableElement" obj="testNode" var="vcellpadding"/> +<assertEquals actual="vcellpadding" expected='"2"' id="cellPaddingLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement13.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement13.xml.kfail deleted file mode 100644 index 4a18d8d..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement13.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="HTMLTableElement13"> -<metadata> -<title>HTMLTableElement13</title> -<creator>NIST</creator> -<description> - The cellpadding attribute specifies the horizontal and vertical space - between cell content and cell borders. - - Retrieve the cellpadding attribute of the first TABLE 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-5916..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcellpadding" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<cellPadding interface="HTMLTableElement" obj="testNode" var="vcellpadding"/> -<assertEquals actual="vcellpadding" expected='"2"' id="cellPaddingLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement14.xml b/test/testcases/tests/level1/html/HTMLTableElement14.xml new file mode 100644 index 0000000..478e9c9 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement14.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="HTMLTableElement14"> +<metadata> +<title>HTMLTableElement14</title> +<creator>NIST</creator> +<description> + The cellSpacing attribute specifies the horizontal and vertical separation + between cells. + + Retrieve the cellSpacing attribute of the first TABLE 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-6890..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="cellSpacing" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<cellSpacing interface="HTMLTableElement" obj="testNode" var="cellSpacing"/> +<assertEquals actual="cellSpacing" expected='"2"' id="cellSpacingLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement14.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement14.xml.kfail deleted file mode 100644 index 478e9c9..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement14.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="HTMLTableElement14"> -<metadata> -<title>HTMLTableElement14</title> -<creator>NIST</creator> -<description> - The cellSpacing attribute specifies the horizontal and vertical separation - between cells. - - Retrieve the cellSpacing attribute of the first TABLE 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-6890..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="cellSpacing" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<cellSpacing interface="HTMLTableElement" obj="testNode" var="cellSpacing"/> -<assertEquals actual="cellSpacing" expected='"2"' id="cellSpacingLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement15.xml b/test/testcases/tests/level1/html/HTMLTableElement15.xml new file mode 100644 index 0000000..51f9763 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement15.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="HTMLTableElement15"> +<metadata> +<title>HTMLTableElement15</title> +<creator>NIST</creator> +<description> + The frame attribute specifies which external table borders to render. + + Retrieve the frame attribute of the first TABLE 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-6480..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vframe" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<frame interface="HTMLTableElement" obj="testNode" var="vframe"/> +<assertEquals actual="vframe" expected='"border"' id="frameLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement15.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement15.xml.kfail deleted file mode 100644 index 51f9763..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement15.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="HTMLTableElement15"> -<metadata> -<title>HTMLTableElement15</title> -<creator>NIST</creator> -<description> - The frame attribute specifies which external table borders to render. - - Retrieve the frame attribute of the first TABLE 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-6480..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vframe" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<frame interface="HTMLTableElement" obj="testNode" var="vframe"/> -<assertEquals actual="vframe" expected='"border"' id="frameLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement16.xml b/test/testcases/tests/level1/html/HTMLTableElement16.xml new file mode 100644 index 0000000..7166437 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement16.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="HTMLTableElement16"> +<metadata> +<title>HTMLTableElement16</title> +<creator>NIST</creator> +<description> + The rules attribute specifies which internal table borders to render. + + Retrieve the rules attribute of the first TABLE 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-2634..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vrules" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<rules interface="HTMLTableElement" obj="testNode" var="vrules"/> +<assertEquals actual="vrules" expected='"all"' id="rulesLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement16.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement16.xml.kfail deleted file mode 100644 index 7166437..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement16.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="HTMLTableElement16"> -<metadata> -<title>HTMLTableElement16</title> -<creator>NIST</creator> -<description> - The rules attribute specifies which internal table borders to render. - - Retrieve the rules attribute of the first TABLE 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-2634..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vrules" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<rules interface="HTMLTableElement" obj="testNode" var="vrules"/> -<assertEquals actual="vrules" expected='"all"' id="rulesLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement17.xml b/test/testcases/tests/level1/html/HTMLTableElement17.xml new file mode 100644 index 0000000..9337c09 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement17.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="HTMLTableElement17"> +<metadata> +<title>HTMLTableElement17</title> +<creator>NIST</creator> +<description> + The summary attribute is a description about the purpose or structure + of a table. + + Retrieve the summary attribute of the first TABLE 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-4499..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsummary" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<summary interface="HTMLTableElement" obj="testNode" var="vsummary"/> +<assertEquals actual="vsummary" expected='"HTML Control Table"' id="summaryLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement17.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement17.xml.kfail deleted file mode 100644 index 9337c09..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement17.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="HTMLTableElement17"> -<metadata> -<title>HTMLTableElement17</title> -<creator>NIST</creator> -<description> - The summary attribute is a description about the purpose or structure - of a table. - - Retrieve the summary attribute of the first TABLE 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-4499..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsummary" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<summary interface="HTMLTableElement" obj="testNode" var="vsummary"/> -<assertEquals actual="vsummary" expected='"HTML Control Table"' id="summaryLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement18.xml b/test/testcases/tests/level1/html/HTMLTableElement18.xml new file mode 100644 index 0000000..210e2b1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement18.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="HTMLTableElement18"> +<metadata> +<title>HTMLTableElement18</title> +<creator>NIST</creator> +<description> + The width attribute specifies the desired table width. + + Retrieve the width attribute of the first TABLE 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-7744..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vwidth" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<width interface="HTMLTableElement" obj="testNode" var="vwidth"/> +<assertEquals actual="vwidth" expected='"680"' id="widthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement18.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement18.xml.kfail deleted file mode 100644 index 210e2b1..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement18.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="HTMLTableElement18"> -<metadata> -<title>HTMLTableElement18</title> -<creator>NIST</creator> -<description> - The width attribute specifies the desired table width. - - Retrieve the width attribute of the first TABLE 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-7744..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vwidth" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<width interface="HTMLTableElement" obj="testNode" var="vwidth"/> -<assertEquals actual="vwidth" expected='"680"' id="widthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement19.xml b/test/testcases/tests/level1/html/HTMLTableElement19.xml new file mode 100644 index 0000000..152174d --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement19.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="HTMLTableElement19"> +<metadata> +<title>HTMLTableElement19</title> +<creator>NIST</creator> +<description> + The createTHead() method creates a table header row or returns + an existing one. + + Create a new THEAD element on the first TABLE element. The first + TABLE element should return null to make sure one doesn't exist. + After creation of the THEAD element the value is once again + checked and should not be null. +</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-7031..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vsection2" type="HTMLTableSectionElement" /> +<var name="newHead" type="HTMLElement" /> +<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="0"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNull actual="vsection1" id="vsection1Id"/> +<createTHead interface="HTMLTableElement" obj="testNode" var="newHead"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<assertNotNull actual="vsection2" id="vsection2Id"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement19.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement19.xml.kfail deleted file mode 100644 index 152174d..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement19.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="HTMLTableElement19"> -<metadata> -<title>HTMLTableElement19</title> -<creator>NIST</creator> -<description> - The createTHead() method creates a table header row or returns - an existing one. - - Create a new THEAD element on the first TABLE element. The first - TABLE element should return null to make sure one doesn't exist. - After creation of the THEAD element the value is once again - checked and should not be null. -</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-7031..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vsection2" type="HTMLTableSectionElement" /> -<var name="newHead" type="HTMLElement" /> -<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="0"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNull actual="vsection1" id="vsection1Id"/> -<createTHead interface="HTMLTableElement" obj="testNode" var="newHead"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<assertNotNull actual="vsection2" id="vsection2Id"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement20.xml b/test/testcases/tests/level1/html/HTMLTableElement20.xml new file mode 100644 index 0000000..032725b --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement20.xml @@ -0,0 +1,50 @@ +<?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="HTMLTableElement20"> +<metadata> +<title>HTMLTableElement20</title> +<creator>NIST</creator> +<description> + The createTHead() method creates a table header row or returns + an existing one. + + Try to create a new THEAD element on the second TABLE element. + Since a THEAD element already exists in the TABLE element a new + THEAD element is not created and information from the already + existing THEAD element is returned. +</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-7031..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="newHead" type="HTMLElement" /> +<var name="valign" type="DOMString" /> +<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"/> +<createTHead interface="HTMLTableElement" obj="testNode" var="newHead"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> +<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement20.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement20.xml.kfail deleted file mode 100644 index 032725b..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement20.xml.kfail +++ /dev/null @@ -1,50 +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="HTMLTableElement20"> -<metadata> -<title>HTMLTableElement20</title> -<creator>NIST</creator> -<description> - The createTHead() method creates a table header row or returns - an existing one. - - Try to create a new THEAD element on the second TABLE element. - Since a THEAD element already exists in the TABLE element a new - THEAD element is not created and information from the already - existing THEAD element is returned. -</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-7031..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="newHead" type="HTMLElement" /> -<var name="valign" type="DOMString" /> -<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"/> -<createTHead interface="HTMLTableElement" obj="testNode" var="newHead"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> -<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" 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 3903b69..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="HTMLTableElement" /> -<var name="vsection2" type="HTMLTableElement" /> -<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/HTMLTableElement22.xml b/test/testcases/tests/level1/html/HTMLTableElement22.xml new file mode 100644 index 0000000..6649b0f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement22.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="HTMLTableElement22"> +<metadata> +<title>HTMLTableElement22</title> +<creator>NIST</creator> +<description> + The createTFoot() method creates a table footer row or returns + an existing one. + + Create a new TFOOT element on the first TABLE element. The first + TABLE element should return null to make sure one doesn't exist. + After creation of the TFOOT element the value is once again + checked and should not be null. +</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-8453710"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vsection2" type="HTMLTableSectionElement" /> +<var name="newFoot" type="HTMLElement" /> +<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="0"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNull actual="vsection1" id="vsection1Id"/> +<createTFoot interface="HTMLTableElement" obj="testNode" var="newFoot"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<assertNotNull actual="vsection2" id="vsection2Id"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement22.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement22.xml.kfail deleted file mode 100644 index 6649b0f..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement22.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="HTMLTableElement22"> -<metadata> -<title>HTMLTableElement22</title> -<creator>NIST</creator> -<description> - The createTFoot() method creates a table footer row or returns - an existing one. - - Create a new TFOOT element on the first TABLE element. The first - TABLE element should return null to make sure one doesn't exist. - After creation of the TFOOT element the value is once again - checked and should not be null. -</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-8453710"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vsection2" type="HTMLTableSectionElement" /> -<var name="newFoot" type="HTMLElement" /> -<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="0"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNull actual="vsection1" id="vsection1Id"/> -<createTFoot interface="HTMLTableElement" obj="testNode" var="newFoot"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<assertNotNull actual="vsection2" id="vsection2Id"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement23.xml b/test/testcases/tests/level1/html/HTMLTableElement23.xml new file mode 100644 index 0000000..1f53f03 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement23.xml @@ -0,0 +1,50 @@ +<?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="HTMLTableElement23"> +<metadata> +<title>HTMLTableElement23</title> +<creator>NIST</creator> +<description> + The createTFoot() method creates a table footer row or returns + an existing one. + + Try to create a new TFOOT element on the second TABLE element. + Since a TFOOT element already exists in the TABLE element a new + TFOOT element is not created and information from the already + existing TFOOT element is returned. +</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-8453710"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="newFoot" type="HTMLElement" /> +<var name="valign" type="DOMString" /> +<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"/> +<createTFoot interface="HTMLTableElement" obj="testNode" var="newFoot"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> +<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement23.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement23.xml.kfail deleted file mode 100644 index 1f53f03..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement23.xml.kfail +++ /dev/null @@ -1,50 +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="HTMLTableElement23"> -<metadata> -<title>HTMLTableElement23</title> -<creator>NIST</creator> -<description> - The createTFoot() method creates a table footer row or returns - an existing one. - - Try to create a new TFOOT element on the second TABLE element. - Since a TFOOT element already exists in the TABLE element a new - TFOOT element is not created and information from the already - existing TFOOT element is returned. -</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-8453710"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="newFoot" type="HTMLElement" /> -<var name="valign" type="DOMString" /> -<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"/> -<createTFoot interface="HTMLTableElement" obj="testNode" var="newFoot"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection"/> -<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" 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 d6f993c..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="HTMLTableElement" /> -<var name="vsection2" type="HTMLTableElement" /> -<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/HTMLTableElement25.xml b/test/testcases/tests/level1/html/HTMLTableElement25.xml new file mode 100644 index 0000000..a28ae65 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement25.xml @@ -0,0 +1,49 @@ +<?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="HTMLTableElement25"> +<metadata> +<title>HTMLTableElement25</title> +<creator>NIST</creator> +<description> + The createCaption() method creates a new table caption object or returns + an existing one. + + Create a new CAPTION element on the first TABLE element. Since + one does not currently exist the CAPTION element is created. +</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-9692..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableCaptionElement" /> +<var name="vsection2" type="HTMLTableCaptionElement" /> +<var name="newCaption" type="HTMLElement" /> +<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="0"/> +<caption interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNull actual="vsection1" id="vsection1Id"/> +<createCaption interface="HTMLTableElement" obj="testNode" var="newCaption"/> +<caption interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<assertNotNull actual="vsection2" id="vsection2Id"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement25.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement25.xml.kfail deleted file mode 100644 index a28ae65..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement25.xml.kfail +++ /dev/null @@ -1,49 +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="HTMLTableElement25"> -<metadata> -<title>HTMLTableElement25</title> -<creator>NIST</creator> -<description> - The createCaption() method creates a new table caption object or returns - an existing one. - - Create a new CAPTION element on the first TABLE element. Since - one does not currently exist the CAPTION element is created. -</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-9692..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableCaptionElement" /> -<var name="vsection2" type="HTMLTableCaptionElement" /> -<var name="newCaption" type="HTMLElement" /> -<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="0"/> -<caption interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNull actual="vsection1" id="vsection1Id"/> -<createCaption interface="HTMLTableElement" obj="testNode" var="newCaption"/> -<caption interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<assertNotNull actual="vsection2" id="vsection2Id"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement26.xml b/test/testcases/tests/level1/html/HTMLTableElement26.xml new file mode 100644 index 0000000..5517f2f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement26.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="HTMLTableElement26"> +<metadata> +<title>HTMLTableElement26</title> +<creator>NIST</creator> +<description> + The createCaption() method creates a new table caption object or returns + an existing one. + + Create a new CAPTION element on the first TABLE element. Since + one currently exists the CAPTION element is not created and you + can get the align attribute from the CAPTION element that exists. +</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-9692..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vcaption" type="HTMLTableCaptionElement" /> +<var name="newCaption" type="HTMLElement" /> +<var name="valign" type="DOMString"/> +<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"/> +<caption interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNotNull actual="vsection1" id="vsection1Id"/> +<createCaption interface="HTMLTableElement" obj="testNode" var="newCaption"/> +<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> +<align interface="HTMLTableCaptionElement" obj="vcaption" var="valign"/> +<assertEquals actual="valign" expected='"top"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement26.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement26.xml.kfail deleted file mode 100644 index 5517f2f..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement26.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="HTMLTableElement26"> -<metadata> -<title>HTMLTableElement26</title> -<creator>NIST</creator> -<description> - The createCaption() method creates a new table caption object or returns - an existing one. - - Create a new CAPTION element on the first TABLE element. Since - one currently exists the CAPTION element is not created and you - can get the align attribute from the CAPTION element that exists. -</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-9692..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vcaption" type="HTMLTableCaptionElement" /> -<var name="newCaption" type="HTMLElement" /> -<var name="valign" type="DOMString"/> -<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"/> -<caption interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNotNull actual="vsection1" id="vsection1Id"/> -<createCaption interface="HTMLTableElement" obj="testNode" var="newCaption"/> -<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> -<align interface="HTMLTableCaptionElement" obj="vcaption" var="valign"/> -<assertEquals actual="valign" expected='"top"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement27.xml b/test/testcases/tests/level1/html/HTMLTableElement27.xml new file mode 100644 index 0000000..c387d69 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement27.xml @@ -0,0 +1,47 @@ +<?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="HTMLTableElement27"> +<metadata> +<title>HTMLTableElement27</title> +<creator>NIST</creator> +<description> + The deleteCaption() method deletes the table caption. + + Delete the CAPTION element on the second TABLE element. +</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-2293..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vsection2" type="HTMLTableSectionElement" /> +<var name="valign" type="DOMString"/> +<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"/> +<caption interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNotNull actual="vsection1" id="vsection1Id"/> +<deleteCaption interface="HTMLTableElement" obj="testNode"/> +<caption interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<assertNull actual="vsection2" id="vsection2Id"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement27.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement27.xml.kfail deleted file mode 100644 index c387d69..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement27.xml.kfail +++ /dev/null @@ -1,47 +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="HTMLTableElement27"> -<metadata> -<title>HTMLTableElement27</title> -<creator>NIST</creator> -<description> - The deleteCaption() method deletes the table caption. - - Delete the CAPTION element on the second TABLE element. -</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-2293..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vsection2" type="HTMLTableSectionElement" /> -<var name="valign" type="DOMString"/> -<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"/> -<caption interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNotNull actual="vsection1" id="vsection1Id"/> -<deleteCaption interface="HTMLTableElement" obj="testNode"/> -<caption interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<assertNull actual="vsection2" id="vsection2Id"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement28.xml b/test/testcases/tests/level1/html/HTMLTableElement28.xml new file mode 100644 index 0000000..95f300c --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement28.xml @@ -0,0 +1,57 @@ +<?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="HTMLTableElement28"> +<metadata> +<title>HTMLTableElement28</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the second TABLE element and invoke the insertRow() method + with an index of 0. Currently the zero indexed row is in the THEAD + section of the TABLE. The number 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-3987..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vsection1" type="HTMLTableSectionElement"/> +<var name="vsection2" type="HTMLTableSectionElement"/> +<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"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="0"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<rows interface="HTMLTableSectionElement" obj="vsection2" 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/HTMLTableElement28.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement28.xml.kfail deleted file mode 100644 index 95f300c..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement28.xml.kfail +++ /dev/null @@ -1,57 +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="HTMLTableElement28"> -<metadata> -<title>HTMLTableElement28</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the second TABLE element and invoke the insertRow() method - with an index of 0. Currently the zero indexed row is in the THEAD - section of the TABLE. The number 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-3987..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vsection1" type="HTMLTableSectionElement"/> -<var name="vsection2" type="HTMLTableSectionElement"/> -<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"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="0"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<rows interface="HTMLTableSectionElement" obj="vsection2" 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/HTMLTableElement29.xml b/test/testcases/tests/level1/html/HTMLTableElement29.xml new file mode 100644 index 0000000..ba62848 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement29.xml @@ -0,0 +1,61 @@ +<?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="HTMLTableElement29"> +<metadata> +<title>HTMLTableElement29</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the second TABLE element and invoke the insertRow() method + with an index of two. Currently the 2nd indexed row is in the TBODY + section of the TABLE. The number 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-3987..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="tbodiesnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="bodyNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vsection1" type="HTMLTableSectionElement"/> +<var name="vsection2" type="HTMLTableSectionElement"/> +<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"/> +<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> +<item interface="HTMLCollection" obj="tbodiesnodeList" var="bodyNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="bodyNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="2"/> +<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> +<item interface="HTMLCollection" obj="tbodiesnodeList" var="bodyNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="bodyNode" 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/HTMLTableElement29.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement29.xml.kfail deleted file mode 100644 index ba62848..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement29.xml.kfail +++ /dev/null @@ -1,61 +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="HTMLTableElement29"> -<metadata> -<title>HTMLTableElement29</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the second TABLE element and invoke the insertRow() method - with an index of two. Currently the 2nd indexed row is in the TBODY - section of the TABLE. The number 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-3987..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="tbodiesnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="bodyNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vsection1" type="HTMLTableSectionElement"/> -<var name="vsection2" type="HTMLTableSectionElement"/> -<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"/> -<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> -<item interface="HTMLCollection" obj="tbodiesnodeList" var="bodyNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="bodyNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="2"/> -<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> -<item interface="HTMLCollection" obj="tbodiesnodeList" var="bodyNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="bodyNode" 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/HTMLTableElement30.xml b/test/testcases/tests/level1/html/HTMLTableElement30.xml new file mode 100644 index 0000000..e45cf68 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement30.xml @@ -0,0 +1,64 @@ +<?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="HTMLTableElement30"> +<metadata> +<title>HTMLTableElement30</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the second TABLE element and invoke the insertRow() method + with an index of four. After the new row is inserted the number of rows + in the table should be five. + Also the number 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-3987..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="tbodiesnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vsection1" type="HTMLTableSectionElement"/> +<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"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="4"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="5" id="rowsLink2" ignoreCase="false"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink3" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail deleted file mode 100644 index e45cf68..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail +++ /dev/null @@ -1,64 +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="HTMLTableElement30"> -<metadata> -<title>HTMLTableElement30</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the second TABLE element and invoke the insertRow() method - with an index of four. After the new row is inserted the number of rows - in the table should be five. - Also the number 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-3987..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="tbodiesnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vsection1" type="HTMLTableSectionElement"/> -<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"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="4"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="5" id="rowsLink2" ignoreCase="false"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink3" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement31.xml b/test/testcases/tests/level1/html/HTMLTableElement31.xml new file mode 100644 index 0000000..e5eb32d --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement31.xml @@ -0,0 +1,65 @@ +<?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="HTMLTableElement31"> +<metadata> +<title>HTMLTableElement31</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. In addition, when + the table is empty the row is inserted into a TBODY which is created + and inserted into the table. + + Load the table1 file which has a non-empty table element. + Create an empty TABLE element and append to the document. + Check to make sure that the empty TABLE element doesn't + have a TBODY element. Insert a new row into the empty + TABLE element. Check for existence of the a TBODY element + in the table. +</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-3987..."/> + +<subject resource="http://lists.w3.org/Archives/Public/www-dom-ts/2002Aug/0019.html"/> +<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="tableNode" type="Node"/> +<var name="tbodiesnodeList" type="HTMLCollection"/> +<var name="newRow" type="HTMLElement"/> +<var name="doc" type="Document"/> +<var name="table" type="Element"/> +<var name="tbodiesLength" type="int"/> +<load var="doc" href="table1" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"body"'/> +<assertSize collection="nodeList" size="1" id="tableSize1"/> +<item interface="NodeList" obj="nodeList" index="0" var="testNode"/> +<createElement obj="doc" var="table" tagName='"table"'/> +<appendChild obj="testNode" newChild="table" var="tableNode"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="2" id="tableSize2"/> +<tBodies interface="HTMLTableElement" obj="tableNode" var="tbodiesnodeList"/> +<length var="tbodiesLength" obj="tbodiesnodeList" interface="HTMLCollection"/> +<assertEquals actual="tbodiesLength" expected="0" id="Asize3" ignoreCase="false"/> +<insertRow interface="HTMLTableElement" obj="tableNode" var="newRow" index="0"/> +<tBodies interface="HTMLTableElement" obj="tableNode" var="tbodiesnodeList"/> +<length var="tbodiesLength" obj="tbodiesnodeList" interface="HTMLCollection"/> +<assertEquals actual="tbodiesLength" expected="1" id="Asize4" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail deleted file mode 100644 index e5eb32d..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail +++ /dev/null @@ -1,65 +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="HTMLTableElement31"> -<metadata> -<title>HTMLTableElement31</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. In addition, when - the table is empty the row is inserted into a TBODY which is created - and inserted into the table. - - Load the table1 file which has a non-empty table element. - Create an empty TABLE element and append to the document. - Check to make sure that the empty TABLE element doesn't - have a TBODY element. Insert a new row into the empty - TABLE element. Check for existence of the a TBODY element - in the table. -</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-3987..."/> - -<subject resource="http://lists.w3.org/Archives/Public/www-dom-ts/2002Aug/0019.html"/> -<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="tableNode" type="Node"/> -<var name="tbodiesnodeList" type="HTMLCollection"/> -<var name="newRow" type="HTMLElement"/> -<var name="doc" type="Document"/> -<var name="table" type="Element"/> -<var name="tbodiesLength" type="int"/> -<load var="doc" href="table1" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"body"'/> -<assertSize collection="nodeList" size="1" id="tableSize1"/> -<item interface="NodeList" obj="nodeList" index="0" var="testNode"/> -<createElement obj="doc" var="table" tagName='"table"'/> -<appendChild obj="testNode" newChild="table" var="tableNode"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="2" id="tableSize2"/> -<tBodies interface="HTMLTableElement" obj="tableNode" var="tbodiesnodeList"/> -<length var="tbodiesLength" obj="tbodiesnodeList" interface="HTMLCollection"/> -<assertEquals actual="tbodiesLength" expected="0" id="Asize3" ignoreCase="false"/> -<insertRow interface="HTMLTableElement" obj="tableNode" var="newRow" index="0"/> -<tBodies interface="HTMLTableElement" obj="tableNode" var="tbodiesnodeList"/> -<length var="tbodiesLength" obj="tbodiesnodeList" interface="HTMLCollection"/> -<assertEquals actual="tbodiesLength" expected="1" id="Asize4" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement32.xml b/test/testcases/tests/level1/html/HTMLTableElement32.xml new file mode 100644 index 0000000..a6529b0 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement32.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="HTMLTableElement32"> +<metadata> +<title>HTMLTableElement32</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a table row. + + Retrieve the second TABLE element and invoke the deleteRow() method + with an index of 0(first row). Currently there are four rows in the + table. After the deleteRow() method is called there should be + three rows in the table. +</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-1311..."/> +</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="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/HTMLTableElement32.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement32.xml.kfail deleted file mode 100644 index a6529b0..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement32.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="HTMLTableElement32"> -<metadata> -<title>HTMLTableElement32</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a table row. - - Retrieve the second TABLE element and invoke the deleteRow() method - with an index of 0(first row). Currently there are four rows in the - table. After the deleteRow() method is called there should be - three rows in the table. -</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-1311..."/> -</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="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/HTMLTableElement33.xml b/test/testcases/tests/level1/html/HTMLTableElement33.xml new file mode 100644 index 0000000..1ae507a --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement33.xml @@ -0,0 +1,50 @@ +<?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="HTMLTableElement33"> +<metadata> +<title>HTMLTableElement33</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a table row. + + Retrieve the second TABLE element and invoke the deleteRow() method + with an index of 3(last row). 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-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1311..."/> +</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="3"/> +<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/HTMLTableElement33.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement33.xml.kfail deleted file mode 100644 index 1ae507a..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement33.xml.kfail +++ /dev/null @@ -1,50 +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="HTMLTableElement33"> -<metadata> -<title>HTMLTableElement33</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a table row. - - Retrieve the second TABLE element and invoke the deleteRow() method - with an index of 3(last row). 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-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1311..."/> -</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="3"/> -<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/HTMLTableRowElement01.xml b/test/testcases/tests/level1/html/HTMLTableRowElement01.xml new file mode 100644 index 0000000..0dbd008 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement01.xml @@ -0,0 +1,46 @@ +<?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="HTMLTableRowElement01"> +<metadata> +<title>HTMLTableRowElement01</title> +<creator>NIST</creator> +<description> + The rowIndex attribute specifies the index of the row, relative to the + entire table, starting from 0. This is in document tree order and + not display order. The rowIndex does not take into account sections + (THEAD, TFOOT, or TBODY) within the table. + + Retrieve the third TR element within the document and examine + its rowIndex 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-6734..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vrowindex" 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"/> +<rowIndex interface="HTMLTableRowElement" obj="testNode" var="vrowindex"/> +<assertEquals actual="vrowindex" expected="1" id="rowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement01.xml.kfail deleted file mode 100644 index 0dbd008..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement01.xml.kfail +++ /dev/null @@ -1,46 +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="HTMLTableRowElement01"> -<metadata> -<title>HTMLTableRowElement01</title> -<creator>NIST</creator> -<description> - The rowIndex attribute specifies the index of the row, relative to the - entire table, starting from 0. This is in document tree order and - not display order. The rowIndex does not take into account sections - (THEAD, TFOOT, or TBODY) within the table. - - Retrieve the third TR element within the document and examine - its rowIndex 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-6734..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vrowindex" 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"/> -<rowIndex interface="HTMLTableRowElement" obj="testNode" var="vrowindex"/> -<assertEquals actual="vrowindex" expected="1" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement02.xml b/test/testcases/tests/level1/html/HTMLTableRowElement02.xml new file mode 100644 index 0000000..284bc84 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement02.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="HTMLTableRowElement02"> +<metadata> +<title>HTMLTableRowElement02</title> +<creator>NIST</creator> +<description> + The sectionRowIndex attribute specifies the index of this row, relative + to the current section(THEAD, TFOOT, or TBODY),starting from 0. + + Retrieve the second TR(1st In THEAD) element within the document and + examine its sectionRowIndex 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-7910..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsectionrowindex" 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="1"/> +<sectionRowIndex interface="HTMLTableRowElement" obj="testNode" var="vsectionrowindex"/> +<assertEquals actual="vsectionrowindex" expected="0" id="sectionRowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement02.xml.kfail deleted file mode 100644 index 284bc84..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement02.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="HTMLTableRowElement02"> -<metadata> -<title>HTMLTableRowElement02</title> -<creator>NIST</creator> -<description> - The sectionRowIndex attribute specifies the index of this row, relative - to the current section(THEAD, TFOOT, or TBODY),starting from 0. - - Retrieve the second TR(1st In THEAD) element within the document and - examine its sectionRowIndex 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-7910..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsectionrowindex" 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="1"/> -<sectionRowIndex interface="HTMLTableRowElement" obj="testNode" var="vsectionrowindex"/> -<assertEquals actual="vsectionrowindex" expected="0" id="sectionRowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement03.xml b/test/testcases/tests/level1/html/HTMLTableRowElement03.xml new file mode 100644 index 0000000..341c2a5 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement03.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="HTMLTableRowElement03"> +<metadata> +<title>HTMLTableRowElement03</title> +<creator>NIST</creator> +<description> + The sectionRowIndex attribute specifies the index of this row, relative + to the current section(THEAD, TFOOT, or TBODY),starting from 0. + + Retrieve the third TR(1st In TFOOT) element within the document and + examine its sectionRowIndex 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-7910..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsectionrowindex" 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="2"/> +<sectionRowIndex interface="HTMLTableRowElement" obj="testNode" var="vsectionrowindex"/> +<assertEquals actual="vsectionrowindex" expected="0" id="sectionRowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement03.xml.kfail deleted file mode 100644 index 341c2a5..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement03.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="HTMLTableRowElement03"> -<metadata> -<title>HTMLTableRowElement03</title> -<creator>NIST</creator> -<description> - The sectionRowIndex attribute specifies the index of this row, relative - to the current section(THEAD, TFOOT, or TBODY),starting from 0. - - Retrieve the third TR(1st In TFOOT) element within the document and - examine its sectionRowIndex 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-7910..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsectionrowindex" 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="2"/> -<sectionRowIndex interface="HTMLTableRowElement" obj="testNode" var="vsectionrowindex"/> -<assertEquals actual="vsectionrowindex" expected="0" id="sectionRowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement04.xml b/test/testcases/tests/level1/html/HTMLTableRowElement04.xml new file mode 100644 index 0000000..bca05d4 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement04.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="HTMLTableRowElement04"> +<metadata> +<title>HTMLTableRowElement04</title> +<creator>NIST</creator> +<description> + The sectionRowIndex attribute specifies the index of this row, relative + to the current section(THEAD, TFOOT, or TBODY),starting from 0. + + Retrieve the fifth TR(2nd In TBODY) element within the document and + examine its sectionRowIndex 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-7910..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsectionrowindex" 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="4"/> +<sectionRowIndex interface="HTMLTableRowElement" obj="testNode" var="vsectionrowindex"/> +<assertEquals actual="vsectionrowindex" expected="1" id="sectionRowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement04.xml.kfail deleted file mode 100644 index bca05d4..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement04.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="HTMLTableRowElement04"> -<metadata> -<title>HTMLTableRowElement04</title> -<creator>NIST</creator> -<description> - The sectionRowIndex attribute specifies the index of this row, relative - to the current section(THEAD, TFOOT, or TBODY),starting from 0. - - Retrieve the fifth TR(2nd In TBODY) element within the document and - examine its sectionRowIndex 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-7910..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsectionrowindex" 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="4"/> -<sectionRowIndex interface="HTMLTableRowElement" obj="testNode" var="vsectionrowindex"/> -<assertEquals actual="vsectionrowindex" expected="1" id="sectionRowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement05.xml b/test/testcases/tests/level1/html/HTMLTableRowElement05.xml new file mode 100644 index 0000000..638126b --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement05.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="HTMLTableRowElement05"> +<metadata> +<title>HTMLTableRowElement05</title> +<creator>NIST</creator> +<description> + The cells attribute specifies the collection of cells in this row. + + Retrieve the fourth TR element and examine the value of + the cells 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-6734..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<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="cellsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement05.xml.kfail deleted file mode 100644 index 638126b..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement05.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="HTMLTableRowElement05"> -<metadata> -<title>HTMLTableRowElement05</title> -<creator>NIST</creator> -<description> - The cells attribute specifies the collection of cells in this row. - - Retrieve the fourth TR element and examine the value of - the cells 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-6734..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<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="cellsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement06.xml b/test/testcases/tests/level1/html/HTMLTableRowElement06.xml new file mode 100644 index 0000000..55fc2ac --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement06.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="HTMLTableRowElement06"> +<metadata> +<title>HTMLTableRowElement06</title> +<creator>NIST</creator> +<description> + The align attribute specifies the horizontal alignment of data within + cells of this row. + + Retrieve the align attribute of the second TR 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-7409..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="valign" type="DOMString" /> +<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="1"/> +<align interface="HTMLTableRowElement" obj="testNode" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement06.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement06.xml.kfail deleted file mode 100644 index 55fc2ac..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement06.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="HTMLTableRowElement06"> -<metadata> -<title>HTMLTableRowElement06</title> -<creator>NIST</creator> -<description> - The align attribute specifies the horizontal alignment of data within - cells of this row. - - Retrieve the align attribute of the second TR 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-7409..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="valign" type="DOMString" /> -<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="1"/> -<align interface="HTMLTableRowElement" obj="testNode" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement07.xml b/test/testcases/tests/level1/html/HTMLTableRowElement07.xml new file mode 100644 index 0000000..c586f6a --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement07.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="HTMLTableRowElement07"> +<metadata> +<title>HTMLTableRowElement07</title> +<creator>NIST</creator> +<description> + The bgColor attribute specifies the background color of rows. + + Retrieve the bgColor attribute of the second TR 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-1816..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vbgcolor" type="DOMString" /> +<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="1"/> +<bgColor interface="HTMLTableRowElement" obj="testNode" var="vbgcolor"/> +<assertEquals actual="vbgcolor" expected='"#00FFFF"' id="bgColorLink" ignoreCase="true"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement07.xml.kfail deleted file mode 100644 index c586f6a..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement07.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="HTMLTableRowElement07"> -<metadata> -<title>HTMLTableRowElement07</title> -<creator>NIST</creator> -<description> - The bgColor attribute specifies the background color of rows. - - Retrieve the bgColor attribute of the second TR 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-1816..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vbgcolor" type="DOMString" /> -<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="1"/> -<bgColor interface="HTMLTableRowElement" obj="testNode" var="vbgcolor"/> -<assertEquals actual="vbgcolor" expected='"#00FFFF"' id="bgColorLink" ignoreCase="true"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement08.xml b/test/testcases/tests/level1/html/HTMLTableRowElement08.xml new file mode 100644 index 0000000..751ef9e --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement08.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="HTMLTableRowElement08"> +<metadata> +<title>HTMLTableRowElement08</title> +<creator>NIST</creator> +<description> + The ch attribute specifies the alignment character for cells in a column. + + Retrieve the char attribute of the second TR 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-1623..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vch" type="DOMString" /> +<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="1"/> +<ch interface="HTMLTableRowElement" obj="testNode" var="vch"/> +<assertEquals actual="vch" expected='"*"' id="chLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement08.xml.kfail deleted file mode 100644 index 751ef9e..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement08.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="HTMLTableRowElement08"> -<metadata> -<title>HTMLTableRowElement08</title> -<creator>NIST</creator> -<description> - The ch attribute specifies the alignment character for cells in a column. - - Retrieve the char attribute of the second TR 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-1623..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vch" type="DOMString" /> -<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="1"/> -<ch interface="HTMLTableRowElement" obj="testNode" var="vch"/> -<assertEquals actual="vch" expected='"*"' id="chLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement09.xml b/test/testcases/tests/level1/html/HTMLTableRowElement09.xml new file mode 100644 index 0000000..eda033b --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement09.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="HTMLTableRowElement09"> +<metadata> +<title>HTMLTableRowElement09</title> +<creator>NIST</creator> +<description> + The chOff attribute specifies the offset of alignment character. + + Retrieve the charoff attribute of the second TR 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-6820..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vchoff" type="DOMString" /> +<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="1"/> +<chOff interface="HTMLTableRowElement" obj="testNode" var="vchoff"/> +<assertEquals actual="vchoff" expected='"1"' id="charOffLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement09.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement09.xml.kfail deleted file mode 100644 index eda033b..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement09.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="HTMLTableRowElement09"> -<metadata> -<title>HTMLTableRowElement09</title> -<creator>NIST</creator> -<description> - The chOff attribute specifies the offset of alignment character. - - Retrieve the charoff attribute of the second TR 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-6820..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vchoff" type="DOMString" /> -<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="1"/> -<chOff interface="HTMLTableRowElement" obj="testNode" var="vchoff"/> -<assertEquals actual="vchoff" expected='"1"' id="charOffLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement10.xml b/test/testcases/tests/level1/html/HTMLTableRowElement10.xml new file mode 100644 index 0000000..3554fb6 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement10.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="HTMLTableRowElement10"> +<metadata> +<title>HTMLTableRowElement10</title> +<creator>NIST</creator> +<description> + The vAlign attribute specifies the vertical alignment of data within + cells of this row. + + Retrieve the vAlign attribute of the second TR 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-9000..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vvalign" type="DOMString" /> +<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="1"/> +<vAlign interface="HTMLTableRowElement" obj="testNode" var="vvalign"/> +<assertEquals actual="vvalign" expected='"middle"' id="vAlignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement10.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement10.xml.kfail deleted file mode 100644 index 3554fb6..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement10.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="HTMLTableRowElement10"> -<metadata> -<title>HTMLTableRowElement10</title> -<creator>NIST</creator> -<description> - The vAlign attribute specifies the vertical alignment of data within - cells of this row. - - Retrieve the vAlign attribute of the second TR 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-9000..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vvalign" type="DOMString" /> -<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="1"/> -<vAlign interface="HTMLTableRowElement" obj="testNode" var="vvalign"/> -<assertEquals actual="vvalign" expected='"middle"' id="vAlignLink" 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/anchor01.xml b/test/testcases/tests/level1/html/anchor01.xml new file mode 100644 index 0000000..19a2711 --- /dev/null +++ b/test/testcases/tests/level1/html/anchor01.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="anchor01"> +<metadata> +<title>anchor01</title> +<creator>Netscape</creator> +<description> +A single character access key to give access to the form control. +The value of attribute accessKey of the anchor element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8964..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vaccesskey" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="anchor" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<accessKey interface="HTMLAnchorElement" obj="testNode" var="vaccesskey"/> +<assertEquals actual="vaccesskey" expected='"g"' id="accessKeyLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/anchor01.xml.notimpl b/test/testcases/tests/level1/html/anchor01.xml.notimpl deleted file mode 100644 index 19a2711..0000000 --- a/test/testcases/tests/level1/html/anchor01.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="anchor01"> -<metadata> -<title>anchor01</title> -<creator>Netscape</creator> -<description> -A single character access key to give access to the form control. -The value of attribute accessKey of the anchor element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8964..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vaccesskey" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="anchor" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<accessKey interface="HTMLAnchorElement" obj="testNode" var="vaccesskey"/> -<assertEquals actual="vaccesskey" expected='"g"' id="accessKeyLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/anchor02.xml b/test/testcases/tests/level1/html/anchor02.xml new file mode 100644 index 0000000..61486a7 --- /dev/null +++ b/test/testcases/tests/level1/html/anchor02.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="anchor02"> +<metadata> +<title>anchor02</title> +<creator>Netscape</creator> +<description> +The character encoding of the linked resource. +The value of attribute charset of the anchor element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6761..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcharset" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="anchor" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<charset interface="HTMLAnchorElement" obj="testNode" var="vcharset"/> +<assertEquals actual="vcharset" expected='"US-ASCII"' id="charsetLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/anchor02.xml.notimpl b/test/testcases/tests/level1/html/anchor02.xml.notimpl deleted file mode 100644 index 61486a7..0000000 --- a/test/testcases/tests/level1/html/anchor02.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="anchor02"> -<metadata> -<title>anchor02</title> -<creator>Netscape</creator> -<description> -The character encoding of the linked resource. -The value of attribute charset of the anchor element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6761..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcharset" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="anchor" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<charset interface="HTMLAnchorElement" obj="testNode" var="vcharset"/> -<assertEquals actual="vcharset" expected='"US-ASCII"' id="charsetLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/anchor03.xml b/test/testcases/tests/level1/html/anchor03.xml new file mode 100644 index 0000000..e6bd32e --- /dev/null +++ b/test/testcases/tests/level1/html/anchor03.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="anchor03"> +<metadata> +<title>anchor03</title> +<creator>Netscape</creator> +<description> +Comma-separated list of lengths, defining an active region geometry. +The value of attribute coords of the anchor element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9207..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcoords" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="anchor" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<coords interface="HTMLAnchorElement" obj="testNode" var="vcoords"/> +<assertEquals actual="vcoords" expected='"0,0,100,100"' id="coordsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/anchor03.xml.notimpl b/test/testcases/tests/level1/html/anchor03.xml.notimpl deleted file mode 100644 index e6bd32e..0000000 --- a/test/testcases/tests/level1/html/anchor03.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="anchor03"> -<metadata> -<title>anchor03</title> -<creator>Netscape</creator> -<description> -Comma-separated list of lengths, defining an active region geometry. -The value of attribute coords of the anchor element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9207..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcoords" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="anchor" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<coords interface="HTMLAnchorElement" obj="testNode" var="vcoords"/> -<assertEquals actual="vcoords" expected='"0,0,100,100"' id="coordsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/anchor04.xml.kfail b/test/testcases/tests/level1/html/anchor04.xml.kfail new file mode 100644 index 0000000..b5ce201 --- /dev/null +++ b/test/testcases/tests/level1/html/anchor04.xml.kfail @@ -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="anchor04"> +<metadata> +<title>anchor04</title> +<creator>Netscape</creator> +<description> +The URI of the linked resource. +The value of attribute href of the anchor element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8851..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vhref" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="anchor" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<href interface="HTMLAnchorElement" obj="testNode" var="vhref"/> +<assertURIEquals actual="vhref" isAbsolute="true" file='"submit.gif"' id="hrefLink"/> +</test> diff --git a/test/testcases/tests/level1/html/anchor04.xml.notimpl b/test/testcases/tests/level1/html/anchor04.xml.notimpl deleted file mode 100644 index b5ce201..0000000 --- a/test/testcases/tests/level1/html/anchor04.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="anchor04"> -<metadata> -<title>anchor04</title> -<creator>Netscape</creator> -<description> -The URI of the linked resource. -The value of attribute href of the anchor element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8851..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vhref" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="anchor" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<href interface="HTMLAnchorElement" obj="testNode" var="vhref"/> -<assertURIEquals actual="vhref" isAbsolute="true" file='"submit.gif"' id="hrefLink"/> -</test> diff --git a/test/testcases/tests/level1/html/anchor05.xml b/test/testcases/tests/level1/html/anchor05.xml new file mode 100644 index 0000000..27b34ac --- /dev/null +++ b/test/testcases/tests/level1/html/anchor05.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="anchor05"> +<metadata> +<title>anchor05</title> +<creator>Netscape</creator> +<description> +Advisory content type. +The value of attribute type of the anchor element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6393..."/> +</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="anchor" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<type interface="HTMLAnchorElement" obj="testNode" var="vtype"/> +<assertEquals actual="vtype" expected='"image/gif"' id="typeLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/anchor05.xml.notimpl b/test/testcases/tests/level1/html/anchor05.xml.notimpl deleted file mode 100644 index 27b34ac..0000000 --- a/test/testcases/tests/level1/html/anchor05.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="anchor05"> -<metadata> -<title>anchor05</title> -<creator>Netscape</creator> -<description> -Advisory content type. -The value of attribute type of the anchor element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6393..."/> -</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="anchor" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<type interface="HTMLAnchorElement" obj="testNode" var="vtype"/> -<assertEquals actual="vtype" expected='"image/gif"' id="typeLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/anchor06.xml b/test/testcases/tests/level1/html/anchor06.xml new file mode 100644 index 0000000..31190be --- /dev/null +++ b/test/testcases/tests/level1/html/anchor06.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="anchor06"> +<metadata> +<title>anchor06</title> +<creator>Netscape</creator> +<description> +The shape of the active area. The coordinates are given by coords +The value of attribute shape of the anchor element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4989..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vshape" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="anchor" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<shape interface="HTMLAnchorElement" obj="testNode" var="vshape"/> +<assertEquals actual="vshape" expected='"rect"' id="shapeLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/anchor06.xml.notimpl b/test/testcases/tests/level1/html/anchor06.xml.notimpl deleted file mode 100644 index 31190be..0000000 --- a/test/testcases/tests/level1/html/anchor06.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="anchor06"> -<metadata> -<title>anchor06</title> -<creator>Netscape</creator> -<description> -The shape of the active area. The coordinates are given by coords -The value of attribute shape of the anchor element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4989..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vshape" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="anchor" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"a"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<shape interface="HTMLAnchorElement" obj="testNode" var="vshape"/> -<assertEquals actual="vshape" expected='"rect"' id="shapeLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/dlist01.xml b/test/testcases/tests/level1/html/dlist01.xml new file mode 100644 index 0000000..35cbe2c --- /dev/null +++ b/test/testcases/tests/level1/html/dlist01.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="dlist01"> +<metadata> +<title>dlist01</title> +<creator>Netscape</creator> +<description> + +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2173..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcompact" type="boolean" /> +<var name="doc" type="Node"/> +<load var="doc" href="dl" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"dl"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<compact interface="HTMLDListElement" obj="testNode" var="vcompact"/> +<assertTrue actual="vcompact" id="compactLink"/> +</test> diff --git a/test/testcases/tests/level1/html/dlist01.xml.notimpl b/test/testcases/tests/level1/html/dlist01.xml.notimpl deleted file mode 100644 index 35cbe2c..0000000 --- a/test/testcases/tests/level1/html/dlist01.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="dlist01"> -<metadata> -<title>dlist01</title> -<creator>Netscape</creator> -<description> - -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2173..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcompact" type="boolean" /> -<var name="doc" type="Node"/> -<load var="doc" href="dl" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"dl"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<compact interface="HTMLDListElement" obj="testNode" var="vcompact"/> -<assertTrue actual="vcompact" id="compactLink"/> -</test> diff --git a/test/testcases/tests/level1/html/table01.xml b/test/testcases/tests/level1/html/table01.xml new file mode 100644 index 0000000..4cee6f7 --- /dev/null +++ b/test/testcases/tests/level1/html/table01.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="table01"> +<metadata> +<title>table01</title> +<creator>Netscape</creator> +<description> +Returns the table's CAPTION, or void if none exists. +The value of attribute caption of the table 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-1459..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcaption" type="Node"/> +<var name="doc" type="Node"/> +<load var="doc" href="table1" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> +<assertNull actual="vcaption" id="captionLink"/> +</test> diff --git a/test/testcases/tests/level1/html/table01.xml.kfail b/test/testcases/tests/level1/html/table01.xml.kfail deleted file mode 100644 index 4cee6f7..0000000 --- a/test/testcases/tests/level1/html/table01.xml.kfail +++ /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="table01"> -<metadata> -<title>table01</title> -<creator>Netscape</creator> -<description> -Returns the table's CAPTION, or void if none exists. -The value of attribute caption of the table 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-1459..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcaption" type="Node"/> -<var name="doc" type="Node"/> -<load var="doc" href="table1" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> -<assertNull actual="vcaption" id="captionLink"/> -</test> diff --git a/test/testcases/tests/level1/html/table02.xml b/test/testcases/tests/level1/html/table02.xml new file mode 100644 index 0000000..2433751 --- /dev/null +++ b/test/testcases/tests/level1/html/table02.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="table02"> +<metadata> +<title>table02</title> +<creator>Netscape</creator> +<description> +Caption alignment with respect to the table. +The value of attribute align of the tablecaption 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-1459..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcaption" type="HTMLTableCaptionElement" /> +<var name="valign" 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"/> +<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> +<align interface="HTMLTableCaptionElement" obj="vcaption" var="valign"/> +<assertEquals actual="valign" expected='"top"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table02.xml.kfail b/test/testcases/tests/level1/html/table02.xml.kfail deleted file mode 100644 index 2433751..0000000 --- a/test/testcases/tests/level1/html/table02.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="table02"> -<metadata> -<title>table02</title> -<creator>Netscape</creator> -<description> -Caption alignment with respect to the table. -The value of attribute align of the tablecaption 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-1459..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcaption" type="HTMLTableCaptionElement" /> -<var name="valign" 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"/> -<caption interface="HTMLTableElement" obj="testNode" var="vcaption"/> -<align interface="HTMLTableCaptionElement" obj="vcaption" var="valign"/> -<assertEquals actual="valign" expected='"top"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table03.xml b/test/testcases/tests/level1/html/table03.xml new file mode 100644 index 0000000..b8c3ef6 --- /dev/null +++ b/test/testcases/tests/level1/html/table03.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="table03"> +<metadata> +<title>table03</title> +<creator>Netscape</creator> +<description> +Alignment character for cells in a column. +The value of attribute ch 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-9530944"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="vch" 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"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> +<ch interface="HTMLTableSectionElement" obj="vsection" var="vch"/> +<assertEquals actual="vch" expected='"*"' id="chLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table03.xml.kfail b/test/testcases/tests/level1/html/table03.xml.kfail deleted file mode 100644 index b8c3ef6..0000000 --- a/test/testcases/tests/level1/html/table03.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="table03"> -<metadata> -<title>table03</title> -<creator>Netscape</creator> -<description> -Alignment character for cells in a column. -The value of attribute ch 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-9530944"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="vch" 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"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> -<ch interface="HTMLTableSectionElement" obj="vsection" var="vch"/> -<assertEquals actual="vch" expected='"*"' id="chLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table04.xml b/test/testcases/tests/level1/html/table04.xml new file mode 100644 index 0000000..2d4fcf8 --- /dev/null +++ b/test/testcases/tests/level1/html/table04.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="table04"> +<metadata> +<title>table04</title> +<creator>Netscape</creator> +<description> +Horizontal alignment of data in cells. +The value of attribute align 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-9530944"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsection" type="HTMLTableSectionElement" /> +<var name="valign" 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"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> +<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table04.xml.kfail b/test/testcases/tests/level1/html/table04.xml.kfail deleted file mode 100644 index 2d4fcf8..0000000 --- a/test/testcases/tests/level1/html/table04.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="table04"> -<metadata> -<title>table04</title> -<creator>Netscape</creator> -<description> -Horizontal alignment of data in cells. -The value of attribute align 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-9530944"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsection" type="HTMLTableSectionElement" /> -<var name="valign" 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"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> -<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" 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/table08.xml b/test/testcases/tests/level1/html/table08.xml new file mode 100644 index 0000000..ea77b80 --- /dev/null +++ b/test/testcases/tests/level1/html/table08.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="table08"> +<metadata> +<title>table08</title> +<creator>Netscape</creator> +<description> +Horizontal alignment of data in cells. +The value of attribute align 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="valign" 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"/> +<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table08.xml.kfail b/test/testcases/tests/level1/html/table08.xml.kfail deleted file mode 100644 index ea77b80..0000000 --- a/test/testcases/tests/level1/html/table08.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="table08"> -<metadata> -<title>table08</title> -<creator>Netscape</creator> -<description> -Horizontal alignment of data in cells. -The value of attribute align 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="valign" 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"/> -<align interface="HTMLTableSectionElement" obj="vsection" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table09.xml b/test/testcases/tests/level1/html/table09.xml new file mode 100644 index 0000000..fcb9018 --- /dev/null +++ b/test/testcases/tests/level1/html/table09.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="table09"> +<metadata> +<title>table09</title> +<creator>Netscape</creator> +<description> +Vertical alignment of data in cells. +The value of attribute valign of the table 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-9530944"/> +</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"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> +<vAlign interface="HTMLTableSectionElement" obj="vsection" var="vvalign"/> +<assertEquals actual="vvalign" expected='"middle"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table09.xml.kfail b/test/testcases/tests/level1/html/table09.xml.kfail deleted file mode 100644 index fcb9018..0000000 --- a/test/testcases/tests/level1/html/table09.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="table09"> -<metadata> -<title>table09</title> -<creator>Netscape</creator> -<description> -Vertical alignment of data in cells. -The value of attribute valign of the table 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-9530944"/> -</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"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> -<vAlign interface="HTMLTableSectionElement" obj="vsection" var="vvalign"/> -<assertEquals actual="vvalign" expected='"middle"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table10.xml b/test/testcases/tests/level1/html/table10.xml new file mode 100644 index 0000000..aa05594 --- /dev/null +++ b/test/testcases/tests/level1/html/table10.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="table10"> +<metadata> +<title>table10</title> +<creator>Netscape</creator> +<description> +Alignment character for cells in a column. +The value of attribute ch 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="vch" 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"/> +<ch interface="HTMLTableSectionElement" obj="vsection" var="vch"/> +<assertEquals actual="vch" expected='"+"' id="chLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table10.xml.kfail b/test/testcases/tests/level1/html/table10.xml.kfail deleted file mode 100644 index aa05594..0000000 --- a/test/testcases/tests/level1/html/table10.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="table10"> -<metadata> -<title>table10</title> -<creator>Netscape</creator> -<description> -Alignment character for cells in a column. -The value of attribute ch 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="vch" 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"/> -<ch interface="HTMLTableSectionElement" obj="vsection" var="vch"/> -<assertEquals actual="vch" expected='"+"' id="chLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table12.xml b/test/testcases/tests/level1/html/table12.xml new file mode 100644 index 0000000..93e475b --- /dev/null +++ b/test/testcases/tests/level1/html/table12.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="table12"> +<metadata> +<title>table12</title> +<creator>Netscape</creator> +<description> +Offset of alignment character. +The value of attribute choff 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="vchoff" 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"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> +<chOff interface="HTMLTableSectionElement" obj="vsection" var="vchoff"/> +<assertEquals actual="vchoff" expected='"1"' id="choffLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table12.xml.kfail b/test/testcases/tests/level1/html/table12.xml.kfail deleted file mode 100644 index 93e475b..0000000 --- a/test/testcases/tests/level1/html/table12.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="table12"> -<metadata> -<title>table12</title> -<creator>Netscape</creator> -<description> -Offset of alignment character. -The value of attribute choff 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="vchoff" 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"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection"/> -<chOff interface="HTMLTableSectionElement" obj="vsection" var="vchoff"/> -<assertEquals actual="vchoff" expected='"1"' id="choffLink" 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/level1/html/table17.xml b/test/testcases/tests/level1/html/table17.xml new file mode 100644 index 0000000..7223562 --- /dev/null +++ b/test/testcases/tests/level1/html/table17.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="table17"> +<metadata> +<title>table17</title> +<creator>Netscape</creator> +<description> +Offset of alignment character. +The value of attribute chOff 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="vchoff" 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"/> +<chOff interface="HTMLTableSectionElement" obj="vsection" var="vchoff"/> +<assertEquals actual="vchoff" expected='"2"' id="choffLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table17.xml.kfail b/test/testcases/tests/level1/html/table17.xml.kfail deleted file mode 100644 index 7223562..0000000 --- a/test/testcases/tests/level1/html/table17.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="table17"> -<metadata> -<title>table17</title> -<creator>Netscape</creator> -<description> -Offset of alignment character. -The value of attribute chOff 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="vchoff" 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"/> -<chOff interface="HTMLTableSectionElement" obj="vsection" var="vchoff"/> -<assertEquals actual="vchoff" expected='"2"' id="choffLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table18.xml b/test/testcases/tests/level1/html/table18.xml new file mode 100644 index 0000000..db8c161 --- /dev/null +++ b/test/testcases/tests/level1/html/table18.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="table18"> +<metadata> +<title>table18</title> +<creator>Netscape</creator> +<description> +The index of this cell in the row. +The value of attribute cellIndex of the tablecell 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-8074..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcindex" type="int" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<cellIndex interface="HTMLTableCellElement" obj="testNode" var="vcindex"/> +<assertEquals actual="vcindex" expected="1" id="cellIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table18.xml.kfail b/test/testcases/tests/level1/html/table18.xml.kfail deleted file mode 100644 index db8c161..0000000 --- a/test/testcases/tests/level1/html/table18.xml.kfail +++ /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="table18"> -<metadata> -<title>table18</title> -<creator>Netscape</creator> -<description> -The index of this cell in the row. -The value of attribute cellIndex of the tablecell 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-8074..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcindex" type="int" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<cellIndex interface="HTMLTableCellElement" obj="testNode" var="vcindex"/> -<assertEquals actual="vcindex" expected="1" id="cellIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table19.xml b/test/testcases/tests/level1/html/table19.xml new file mode 100644 index 0000000..e88be88 --- /dev/null +++ b/test/testcases/tests/level1/html/table19.xml @@ -0,0 +1,41 @@ +<?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="table19"> +<metadata> +<title>table19</title> +<creator>Netscape</creator> +<description> +Abbreviation for header cells. +The index of this cell in the row. +The value of attribute abbr of the tablecell 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-7444..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vabbr" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<abbr interface="HTMLTableCellElement" obj="testNode" var="vabbr"/> +<assertEquals actual="vabbr" expected='"hd2"' id="abbrLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table19.xml.kfail b/test/testcases/tests/level1/html/table19.xml.kfail deleted file mode 100644 index e88be88..0000000 --- a/test/testcases/tests/level1/html/table19.xml.kfail +++ /dev/null @@ -1,41 +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="table19"> -<metadata> -<title>table19</title> -<creator>Netscape</creator> -<description> -Abbreviation for header cells. -The index of this cell in the row. -The value of attribute abbr of the tablecell 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-7444..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vabbr" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<abbr interface="HTMLTableCellElement" obj="testNode" var="vabbr"/> -<assertEquals actual="vabbr" expected='"hd2"' id="abbrLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table20.xml b/test/testcases/tests/level1/html/table20.xml new file mode 100644 index 0000000..2205987 --- /dev/null +++ b/test/testcases/tests/level1/html/table20.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="table20"> +<metadata> +<title>table20</title> +<creator>Netscape</creator> +<description> +Names group of related headers. +The value of attribute axis of the tablecell 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-7655..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vaxis" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<axis interface="HTMLTableCellElement" obj="testNode" var="vaxis"/> +<assertEquals actual="vaxis" expected='"center"' id="axisLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table20.xml.kfail b/test/testcases/tests/level1/html/table20.xml.kfail deleted file mode 100644 index 2205987..0000000 --- a/test/testcases/tests/level1/html/table20.xml.kfail +++ /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="table20"> -<metadata> -<title>table20</title> -<creator>Netscape</creator> -<description> -Names group of related headers. -The value of attribute axis of the tablecell 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-7655..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vaxis" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<axis interface="HTMLTableCellElement" obj="testNode" var="vaxis"/> -<assertEquals actual="vaxis" expected='"center"' id="axisLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table21.xml b/test/testcases/tests/level1/html/table21.xml new file mode 100644 index 0000000..fa22103 --- /dev/null +++ b/test/testcases/tests/level1/html/table21.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="table21"> +<metadata> +<title>table21</title> +<creator>Netscape</creator> +<description> +Horizontal alignment of data in cell. +The value of attribute align of the tablecell 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-9843..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="valign" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<align interface="HTMLTableCellElement" obj="testNode" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table21.xml.kfail b/test/testcases/tests/level1/html/table21.xml.kfail deleted file mode 100644 index fa22103..0000000 --- a/test/testcases/tests/level1/html/table21.xml.kfail +++ /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="table21"> -<metadata> -<title>table21</title> -<creator>Netscape</creator> -<description> -Horizontal alignment of data in cell. -The value of attribute align of the tablecell 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-9843..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="valign" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<align interface="HTMLTableCellElement" obj="testNode" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table22.xml b/test/testcases/tests/level1/html/table22.xml new file mode 100644 index 0000000..7c097b4 --- /dev/null +++ b/test/testcases/tests/level1/html/table22.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="table22"> +<metadata> +<title>table22</title> +<creator>Netscape</creator> +<description> +Cell background color. +The value of attribute bgColor of the tablecell 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-8813..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vbgcolor" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<bgColor interface="HTMLTableCellElement" obj="testNode" var="vbgcolor"/> +<assertEquals actual="vbgcolor" expected='"#FF0000"' id="bgcolorLink" ignoreCase="true"/> +</test> diff --git a/test/testcases/tests/level1/html/table22.xml.kfail b/test/testcases/tests/level1/html/table22.xml.kfail deleted file mode 100644 index 7c097b4..0000000 --- a/test/testcases/tests/level1/html/table22.xml.kfail +++ /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="table22"> -<metadata> -<title>table22</title> -<creator>Netscape</creator> -<description> -Cell background color. -The value of attribute bgColor of the tablecell 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-8813..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vbgcolor" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<bgColor interface="HTMLTableCellElement" obj="testNode" var="vbgcolor"/> -<assertEquals actual="vbgcolor" expected='"#FF0000"' id="bgcolorLink" ignoreCase="true"/> -</test> diff --git a/test/testcases/tests/level1/html/table23.xml b/test/testcases/tests/level1/html/table23.xml new file mode 100644 index 0000000..4ea8ace --- /dev/null +++ b/test/testcases/tests/level1/html/table23.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="table23"> +<metadata> +<title>table23</title> +<creator>Netscape</creator> +<description> +Alignment character for cells in a column. +The value of attribute char of the tablecell 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-3091..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vch" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<ch interface="HTMLTableCellElement" obj="testNode" var="vch"/> +<assertEquals actual="vch" expected='":"' id="chLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table23.xml.kfail b/test/testcases/tests/level1/html/table23.xml.kfail deleted file mode 100644 index 4ea8ace..0000000 --- a/test/testcases/tests/level1/html/table23.xml.kfail +++ /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="table23"> -<metadata> -<title>table23</title> -<creator>Netscape</creator> -<description> -Alignment character for cells in a column. -The value of attribute char of the tablecell 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-3091..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vch" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<ch interface="HTMLTableCellElement" obj="testNode" var="vch"/> -<assertEquals actual="vch" expected='":"' id="chLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table24.xml b/test/testcases/tests/level1/html/table24.xml new file mode 100644 index 0000000..7606917 --- /dev/null +++ b/test/testcases/tests/level1/html/table24.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="table24"> +<metadata> +<title>table24</title> +<creator>Netscape</creator> +<description> +offset of alignment character. +The value of attribute chOff of the tablecell 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-2014..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vchoff" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<chOff interface="HTMLTableCellElement" obj="testNode" var="vchoff"/> +<assertEquals actual="vchoff" expected='"1"' id="chOffLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table24.xml.kfail b/test/testcases/tests/level1/html/table24.xml.kfail deleted file mode 100644 index 7606917..0000000 --- a/test/testcases/tests/level1/html/table24.xml.kfail +++ /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="table24"> -<metadata> -<title>table24</title> -<creator>Netscape</creator> -<description> -offset of alignment character. -The value of attribute chOff of the tablecell 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-2014..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vchoff" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<chOff interface="HTMLTableCellElement" obj="testNode" var="vchoff"/> -<assertEquals actual="vchoff" expected='"1"' id="chOffLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table25.xml b/test/testcases/tests/level1/html/table25.xml new file mode 100644 index 0000000..b8e10dd --- /dev/null +++ b/test/testcases/tests/level1/html/table25.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="table25"> +<metadata> +<title>table25</title> +<creator>Netscape</creator> +<description> +Number of columns spanned by cell. +The value of attribute colspan of the tablecell 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-8464..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcolspan" type="int" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<colSpan interface="HTMLTableCellElement" obj="testNode" var="vcolspan"/> +<assertEquals actual="vcolspan" expected="1" id="colSpanLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table25.xml.kfail b/test/testcases/tests/level1/html/table25.xml.kfail deleted file mode 100644 index b8e10dd..0000000 --- a/test/testcases/tests/level1/html/table25.xml.kfail +++ /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="table25"> -<metadata> -<title>table25</title> -<creator>Netscape</creator> -<description> -Number of columns spanned by cell. -The value of attribute colspan of the tablecell 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-8464..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcolspan" type="int" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<colSpan interface="HTMLTableCellElement" obj="testNode" var="vcolspan"/> -<assertEquals actual="vcolspan" expected="1" id="colSpanLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table26.xml b/test/testcases/tests/level1/html/table26.xml new file mode 100644 index 0000000..9f09d4f --- /dev/null +++ b/test/testcases/tests/level1/html/table26.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="table26"> +<metadata> +<title>table26</title> +<creator>Netscape</creator> +<description> +The value of attribute height of the tablecell 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-8367..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vheight" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<height interface="HTMLTableCellElement" obj="testNode" var="vheight"/> +<assertEquals actual="vheight" expected='"50"' id="heightLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table26.xml.kfail b/test/testcases/tests/level1/html/table26.xml.kfail deleted file mode 100644 index 9f09d4f..0000000 --- a/test/testcases/tests/level1/html/table26.xml.kfail +++ /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="table26"> -<metadata> -<title>table26</title> -<creator>Netscape</creator> -<description> -The value of attribute height of the tablecell 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-8367..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vheight" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<height interface="HTMLTableCellElement" obj="testNode" var="vheight"/> -<assertEquals actual="vheight" expected='"50"' id="heightLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table27.xml b/test/testcases/tests/level1/html/table27.xml new file mode 100644 index 0000000..e0dc78d --- /dev/null +++ b/test/testcases/tests/level1/html/table27.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="table27"> +<metadata> +<title>table27</title> +<creator>Netscape</creator> +<description> +Suppress word wrapping. +The value of attribute nowrap of the tablecell 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-6292..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vnowrap" type="boolean" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<noWrap interface="HTMLTableCellElement" obj="testNode" var="vnowrap"/> +<assertTrue actual="vnowrap" id="nowrapLink"/> +</test> diff --git a/test/testcases/tests/level1/html/table27.xml.kfail b/test/testcases/tests/level1/html/table27.xml.kfail deleted file mode 100644 index e0dc78d..0000000 --- a/test/testcases/tests/level1/html/table27.xml.kfail +++ /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="table27"> -<metadata> -<title>table27</title> -<creator>Netscape</creator> -<description> -Suppress word wrapping. -The value of attribute nowrap of the tablecell 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-6292..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vnowrap" type="boolean" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<noWrap interface="HTMLTableCellElement" obj="testNode" var="vnowrap"/> -<assertTrue actual="vnowrap" id="nowrapLink"/> -</test> diff --git a/test/testcases/tests/level1/html/table28.xml b/test/testcases/tests/level1/html/table28.xml new file mode 100644 index 0000000..d445a1c --- /dev/null +++ b/test/testcases/tests/level1/html/table28.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="table28"> +<metadata> +<title>table28</title> +<creator>Netscape</creator> +<description> +Number of rows spanned by cell. +The value of attribute rowspan of the tablecell 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-4823..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vrowspan" type="int" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rowSpan interface="HTMLTableCellElement" obj="testNode" var="vrowspan"/> +<assertEquals actual="vrowspan" expected="1" id="rowSpanLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table28.xml.kfail b/test/testcases/tests/level1/html/table28.xml.kfail deleted file mode 100644 index d445a1c..0000000 --- a/test/testcases/tests/level1/html/table28.xml.kfail +++ /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="table28"> -<metadata> -<title>table28</title> -<creator>Netscape</creator> -<description> -Number of rows spanned by cell. -The value of attribute rowspan of the tablecell 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-4823..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vrowspan" type="int" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rowSpan interface="HTMLTableCellElement" obj="testNode" var="vrowspan"/> -<assertEquals actual="vrowspan" expected="1" id="rowSpanLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table29.xml b/test/testcases/tests/level1/html/table29.xml new file mode 100644 index 0000000..ae483d4 --- /dev/null +++ b/test/testcases/tests/level1/html/table29.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="table29"> +<metadata> +<title>table29</title> +<creator>Netscape</creator> +<description> +Scope covered by header cells. +The value of attribute scope of the tablecell 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-3613..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vscope" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<scope interface="HTMLTableCellElement" obj="testNode" var="vscope"/> +<assertEquals actual="vscope" expected='"col"' id="scopeLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table29.xml.kfail b/test/testcases/tests/level1/html/table29.xml.kfail deleted file mode 100644 index ae483d4..0000000 --- a/test/testcases/tests/level1/html/table29.xml.kfail +++ /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="table29"> -<metadata> -<title>table29</title> -<creator>Netscape</creator> -<description> -Scope covered by header cells. -The value of attribute scope of the tablecell 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-3613..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vscope" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<scope interface="HTMLTableCellElement" obj="testNode" var="vscope"/> -<assertEquals actual="vscope" expected='"col"' id="scopeLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table30.xml b/test/testcases/tests/level1/html/table30.xml new file mode 100644 index 0000000..837be29 --- /dev/null +++ b/test/testcases/tests/level1/html/table30.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="table30"> +<metadata> +<title>table30</title> +<creator>Netscape</creator> +<description> +List of id attribute values for header cells. +The value of attribute headers of the tablecell 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-8910..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vheaders" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<headers interface="HTMLTableCellElement" obj="testNode" var="vheaders"/> +<assertEquals actual="vheaders" expected='"header-3"' id="headersLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table30.xml.kfail b/test/testcases/tests/level1/html/table30.xml.kfail deleted file mode 100644 index 837be29..0000000 --- a/test/testcases/tests/level1/html/table30.xml.kfail +++ /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="table30"> -<metadata> -<title>table30</title> -<creator>Netscape</creator> -<description> -List of id attribute values for header cells. -The value of attribute headers of the tablecell 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-8910..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vheaders" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<headers interface="HTMLTableCellElement" obj="testNode" var="vheaders"/> -<assertEquals actual="vheaders" expected='"header-3"' id="headersLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table31.xml b/test/testcases/tests/level1/html/table31.xml new file mode 100644 index 0000000..f5c3fa6 --- /dev/null +++ b/test/testcases/tests/level1/html/table31.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="table31"> +<metadata> +<title>table31</title> +<creator>Netscape</creator> +<description> +Vertical alignment of data in cell. +The value of attribute valign of the tablecell 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-5828..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vvalign" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<vAlign interface="HTMLTableCellElement" obj="testNode" var="vvalign"/> +<assertEquals actual="vvalign" expected='"middle"' id="vAlignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table31.xml.kfail b/test/testcases/tests/level1/html/table31.xml.kfail deleted file mode 100644 index f5c3fa6..0000000 --- a/test/testcases/tests/level1/html/table31.xml.kfail +++ /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="table31"> -<metadata> -<title>table31</title> -<creator>Netscape</creator> -<description> -Vertical alignment of data in cell. -The value of attribute valign of the tablecell 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-5828..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vvalign" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<vAlign interface="HTMLTableCellElement" obj="testNode" var="vvalign"/> -<assertEquals actual="vvalign" expected='"middle"' id="vAlignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table32.xml b/test/testcases/tests/level1/html/table32.xml new file mode 100644 index 0000000..cf7e0cd --- /dev/null +++ b/test/testcases/tests/level1/html/table32.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="table32"> +<metadata> +<title>table32</title> +<creator>Netscape</creator> +<description> +cell width. +The value of attribute width of the table 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-2748..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vwidth" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecell" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> +<assertSize collection="nodeList" size="4" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<width interface="HTMLTableCellElement" obj="testNode" var="vwidth"/> +<assertEquals actual="vwidth" expected='"175"' id="vwidthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table32.xml.kfail b/test/testcases/tests/level1/html/table32.xml.kfail deleted file mode 100644 index cf7e0cd..0000000 --- a/test/testcases/tests/level1/html/table32.xml.kfail +++ /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="table32"> -<metadata> -<title>table32</title> -<creator>Netscape</creator> -<description> -cell width. -The value of attribute width of the table 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-2748..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vwidth" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecell" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"td"'/> -<assertSize collection="nodeList" size="4" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<width interface="HTMLTableCellElement" obj="testNode" var="vwidth"/> -<assertEquals actual="vwidth" expected='"175"' id="vwidthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table33.xml b/test/testcases/tests/level1/html/table33.xml new file mode 100644 index 0000000..5c0e447 --- /dev/null +++ b/test/testcases/tests/level1/html/table33.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="table33"> +<metadata> +<title>table33</title> +<creator>Netscape</creator> +<description> +Specifies the table's position with respect to the rest of the document. +The value of attribute align of the table 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-2318..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="valign" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<align interface="HTMLTableElement" obj="testNode" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table33.xml.kfail b/test/testcases/tests/level1/html/table33.xml.kfail deleted file mode 100644 index 5c0e447..0000000 --- a/test/testcases/tests/level1/html/table33.xml.kfail +++ /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="table33"> -<metadata> -<title>table33</title> -<creator>Netscape</creator> -<description> -Specifies the table's position with respect to the rest of the document. -The value of attribute align of the table 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-2318..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="valign" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<align interface="HTMLTableElement" obj="testNode" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table34.xml b/test/testcases/tests/level1/html/table34.xml new file mode 100644 index 0000000..07443ef --- /dev/null +++ b/test/testcases/tests/level1/html/table34.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="table34"> +<metadata> +<title>table34</title> +<creator>Netscape</creator> +<description> +The width of the border around the table. +The value of attribute border of the table 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-5096..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vborder" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<border interface="HTMLTableElement" obj="testNode" var="vborder"/> +<assertEquals actual="vborder" expected='"4"' id="borderLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table34.xml.kfail b/test/testcases/tests/level1/html/table34.xml.kfail deleted file mode 100644 index 07443ef..0000000 --- a/test/testcases/tests/level1/html/table34.xml.kfail +++ /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="table34"> -<metadata> -<title>table34</title> -<creator>Netscape</creator> -<description> -The width of the border around the table. -The value of attribute border of the table 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-5096..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vborder" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<border interface="HTMLTableElement" obj="testNode" var="vborder"/> -<assertEquals actual="vborder" expected='"4"' id="borderLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table35.xml b/test/testcases/tests/level1/html/table35.xml new file mode 100644 index 0000000..32cce60 --- /dev/null +++ b/test/testcases/tests/level1/html/table35.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="table35"> +<metadata> +<title>table35</title> +<creator>Netscape</creator> +<description> +Cell background color. +The value of attribute bgcolor of the table 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-8353..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vbgcolor" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<bgColor interface="HTMLTableElement" obj="testNode" var="vbgcolor"/> +<assertEquals actual="vbgcolor" expected='"#ff0000"' id="bgcolorLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table35.xml.kfail b/test/testcases/tests/level1/html/table35.xml.kfail deleted file mode 100644 index 32cce60..0000000 --- a/test/testcases/tests/level1/html/table35.xml.kfail +++ /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="table35"> -<metadata> -<title>table35</title> -<creator>Netscape</creator> -<description> -Cell background color. -The value of attribute bgcolor of the table 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-8353..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vbgcolor" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<bgColor interface="HTMLTableElement" obj="testNode" var="vbgcolor"/> -<assertEquals actual="vbgcolor" expected='"#ff0000"' id="bgcolorLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table36.xml b/test/testcases/tests/level1/html/table36.xml new file mode 100644 index 0000000..2bdded8 --- /dev/null +++ b/test/testcases/tests/level1/html/table36.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="table36"> +<metadata> +<title>table36</title> +<creator>Netscape</creator> +<description> +Specifies which external table borders to render. +The value of attribute frame of the table 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-6480..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vframe" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<frame interface="HTMLTableElement" obj="testNode" var="vframe"/> +<assertEquals actual="vframe" expected='"border"' id="frameLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table36.xml.kfail b/test/testcases/tests/level1/html/table36.xml.kfail deleted file mode 100644 index 2bdded8..0000000 --- a/test/testcases/tests/level1/html/table36.xml.kfail +++ /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="table36"> -<metadata> -<title>table36</title> -<creator>Netscape</creator> -<description> -Specifies which external table borders to render. -The value of attribute frame of the table 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-6480..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vframe" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<frame interface="HTMLTableElement" obj="testNode" var="vframe"/> -<assertEquals actual="vframe" expected='"border"' id="frameLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table37.xml b/test/testcases/tests/level1/html/table37.xml new file mode 100644 index 0000000..cdf5b73 --- /dev/null +++ b/test/testcases/tests/level1/html/table37.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="table37"> +<metadata> +<title>table37</title> +<creator>Netscape</creator> +<description> +Specifies the horizontal and vertical space between cell content and cell borders. The value of attribute cellpadding of the table 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-5916..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcellpadding" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<cellPadding interface="HTMLTableElement" obj="testNode" var="vcellpadding"/> +<assertEquals actual="vcellpadding" expected='"2"' id="cellpaddingLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table37.xml.kfail b/test/testcases/tests/level1/html/table37.xml.kfail deleted file mode 100644 index cdf5b73..0000000 --- a/test/testcases/tests/level1/html/table37.xml.kfail +++ /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="table37"> -<metadata> -<title>table37</title> -<creator>Netscape</creator> -<description> -Specifies the horizontal and vertical space between cell content and cell borders. The value of attribute cellpadding of the table 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-5916..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcellpadding" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<cellPadding interface="HTMLTableElement" obj="testNode" var="vcellpadding"/> -<assertEquals actual="vcellpadding" expected='"2"' id="cellpaddingLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table38.xml b/test/testcases/tests/level1/html/table38.xml new file mode 100644 index 0000000..fad8dfe --- /dev/null +++ b/test/testcases/tests/level1/html/table38.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="table38"> +<metadata> +<title>table38</title> +<creator>Netscape</creator> +<description> +Specifies the horizontal and vertical separation between cells. +The value of attribute cellspacing of the table 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-6890..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcellspacing" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<cellSpacing interface="HTMLTableElement" obj="testNode" var="vcellspacing"/> +<assertEquals actual="vcellspacing" expected='"2"' id="cellspacingLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table38.xml.kfail b/test/testcases/tests/level1/html/table38.xml.kfail deleted file mode 100644 index fad8dfe..0000000 --- a/test/testcases/tests/level1/html/table38.xml.kfail +++ /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="table38"> -<metadata> -<title>table38</title> -<creator>Netscape</creator> -<description> -Specifies the horizontal and vertical separation between cells. -The value of attribute cellspacing of the table 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-6890..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcellspacing" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<cellSpacing interface="HTMLTableElement" obj="testNode" var="vcellspacing"/> -<assertEquals actual="vcellspacing" expected='"2"' id="cellspacingLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table39.xml b/test/testcases/tests/level1/html/table39.xml new file mode 100644 index 0000000..1fd66db --- /dev/null +++ b/test/testcases/tests/level1/html/table39.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="table39"> +<metadata> +<title>table39</title> +<creator>Netscape</creator> +<description> +Supplementary description about the purpose or structure of a table. +The value of attribute summary of the table 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-4499..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsummary" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<summary interface="HTMLTableElement" obj="testNode" var="vsummary"/> +<assertEquals actual="vsummary" expected='"HTML Control Table"' id="summaryLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table39.xml.kfail b/test/testcases/tests/level1/html/table39.xml.kfail deleted file mode 100644 index 1fd66db..0000000 --- a/test/testcases/tests/level1/html/table39.xml.kfail +++ /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="table39"> -<metadata> -<title>table39</title> -<creator>Netscape</creator> -<description> -Supplementary description about the purpose or structure of a table. -The value of attribute summary of the table 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-4499..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsummary" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<summary interface="HTMLTableElement" obj="testNode" var="vsummary"/> -<assertEquals actual="vsummary" expected='"HTML Control Table"' id="summaryLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table40.xml b/test/testcases/tests/level1/html/table40.xml new file mode 100644 index 0000000..31a9763 --- /dev/null +++ b/test/testcases/tests/level1/html/table40.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="table40"> +<metadata> +<title>table40</title> +<creator>Netscape</creator> +<description> +Specifies which internal table borders to render. +The value of attribute rules of the table 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-2634..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vrules" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<rules interface="HTMLTableElement" obj="testNode" var="vrules"/> +<assertEquals actual="vrules" expected='"all"' id="rulesLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table40.xml.kfail b/test/testcases/tests/level1/html/table40.xml.kfail deleted file mode 100644 index 31a9763..0000000 --- a/test/testcases/tests/level1/html/table40.xml.kfail +++ /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="table40"> -<metadata> -<title>table40</title> -<creator>Netscape</creator> -<description> -Specifies which internal table borders to render. -The value of attribute rules of the table 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-2634..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vrules" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<rules interface="HTMLTableElement" obj="testNode" var="vrules"/> -<assertEquals actual="vrules" expected='"all"' id="rulesLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table41.xml b/test/testcases/tests/level1/html/table41.xml new file mode 100644 index 0000000..4030b09 --- /dev/null +++ b/test/testcases/tests/level1/html/table41.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="table41"> +<metadata> +<title>table41</title> +<creator>Netscape</creator> +<description> +Specifies the desired table width. +The value of attribute width of the table 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-7744..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vwidth" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<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"/> +<width interface="HTMLTableElement" obj="testNode" var="vwidth"/> +<assertEquals actual="vwidth" expected='"680"' id="widthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table41.xml.kfail b/test/testcases/tests/level1/html/table41.xml.kfail deleted file mode 100644 index 4030b09..0000000 --- a/test/testcases/tests/level1/html/table41.xml.kfail +++ /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="table41"> -<metadata> -<title>table41</title> -<creator>Netscape</creator> -<description> -Specifies the desired table width. -The value of attribute width of the table 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-7744..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vwidth" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<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"/> -<width interface="HTMLTableElement" obj="testNode" var="vwidth"/> -<assertEquals actual="vwidth" expected='"680"' id="widthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table42.xml b/test/testcases/tests/level1/html/table42.xml new file mode 100644 index 0000000..8fa86f1 --- /dev/null +++ b/test/testcases/tests/level1/html/table42.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="table42"> +<metadata> +<title>table42</title> +<creator>Netscape</creator> +<description> +Horizontal alignment of data within cells of this row. +The value of attribute align of the tablerow 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-7409..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="valign" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="8" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<align interface="HTMLTableRowElement" obj="testNode" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table42.xml.kfail b/test/testcases/tests/level1/html/table42.xml.kfail deleted file mode 100644 index 8fa86f1..0000000 --- a/test/testcases/tests/level1/html/table42.xml.kfail +++ /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="table42"> -<metadata> -<title>table42</title> -<creator>Netscape</creator> -<description> -Horizontal alignment of data within cells of this row. -The value of attribute align of the tablerow 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-7409..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="valign" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="8" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<align interface="HTMLTableRowElement" obj="testNode" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table43.xml b/test/testcases/tests/level1/html/table43.xml new file mode 100644 index 0000000..ea9e5de --- /dev/null +++ b/test/testcases/tests/level1/html/table43.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="table43"> +<metadata> +<title>table43</title> +<creator>Netscape</creator> +<description> +Background color for rows. +The value of attribute bgcolor of the tablerow 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-1816..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vbgcolor" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="8" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<bgColor interface="HTMLTableRowElement" obj="testNode" var="vbgcolor"/> +<assertEquals actual="vbgcolor" expected='"#00FFFF"' id="bgcolorLink" ignoreCase="true"/> +</test> diff --git a/test/testcases/tests/level1/html/table43.xml.kfail b/test/testcases/tests/level1/html/table43.xml.kfail deleted file mode 100644 index ea9e5de..0000000 --- a/test/testcases/tests/level1/html/table43.xml.kfail +++ /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="table43"> -<metadata> -<title>table43</title> -<creator>Netscape</creator> -<description> -Background color for rows. -The value of attribute bgcolor of the tablerow 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-1816..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vbgcolor" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="8" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<bgColor interface="HTMLTableRowElement" obj="testNode" var="vbgcolor"/> -<assertEquals actual="vbgcolor" expected='"#00FFFF"' id="bgcolorLink" ignoreCase="true"/> -</test> diff --git a/test/testcases/tests/level1/html/table44.xml b/test/testcases/tests/level1/html/table44.xml new file mode 100644 index 0000000..a893f76 --- /dev/null +++ b/test/testcases/tests/level1/html/table44.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="table44"> +<metadata> +<title>table44</title> +<creator>Netscape</creator> +<description> +Vertical alignment of data within cells of this row. +The value of attribute valign of the tablerow 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-9000..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vvalign" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="table" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="8" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<vAlign interface="HTMLTableRowElement" obj="testNode" var="vvalign"/> +<assertEquals actual="vvalign" expected='"middle"' id="valignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table44.xml.kfail b/test/testcases/tests/level1/html/table44.xml.kfail deleted file mode 100644 index a893f76..0000000 --- a/test/testcases/tests/level1/html/table44.xml.kfail +++ /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="table44"> -<metadata> -<title>table44</title> -<creator>Netscape</creator> -<description> -Vertical alignment of data within cells of this row. -The value of attribute valign of the tablerow 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-9000..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vvalign" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="table" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="8" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<vAlign interface="HTMLTableRowElement" obj="testNode" var="vvalign"/> -<assertEquals actual="vvalign" expected='"middle"' id="valignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table45.xml b/test/testcases/tests/level1/html/table45.xml new file mode 100644 index 0000000..b1717db --- /dev/null +++ b/test/testcases/tests/level1/html/table45.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="table45"> +<metadata> +<title>table45</title> +<creator>Netscape</creator> +<description> +Alignment character for cells in a column. +The value of attribute ch of the tablerow 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-1623..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vch" type="DOMString" /> +<var name="doc" type="Node"/> +<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="1"/> +<ch interface="HTMLTableRowElement" obj="testNode" var="vch"/> +<assertEquals actual="vch" expected='"*"' id="vchLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table45.xml.kfail b/test/testcases/tests/level1/html/table45.xml.kfail deleted file mode 100644 index b1717db..0000000 --- a/test/testcases/tests/level1/html/table45.xml.kfail +++ /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="table45"> -<metadata> -<title>table45</title> -<creator>Netscape</creator> -<description> -Alignment character for cells in a column. -The value of attribute ch of the tablerow 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-1623..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vch" type="DOMString" /> -<var name="doc" type="Node"/> -<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="1"/> -<ch interface="HTMLTableRowElement" obj="testNode" var="vch"/> -<assertEquals actual="vch" expected='"*"' id="vchLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table46.xml b/test/testcases/tests/level1/html/table46.xml new file mode 100644 index 0000000..096b892 --- /dev/null +++ b/test/testcases/tests/level1/html/table46.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="table46"> +<metadata> +<title>table46</title> +<creator>Netscape</creator> +<description> +Offset of alignment character. +The value of attribute choff of the tablerow 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-6820..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vchoff" type="DOMString" /> +<var name="doc" type="Node"/> +<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="1"/> +<chOff interface="HTMLTableRowElement" obj="testNode" var="vchoff"/> +<assertEquals actual="vchoff" expected='"1"' id="choffLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table46.xml.kfail b/test/testcases/tests/level1/html/table46.xml.kfail deleted file mode 100644 index 096b892..0000000 --- a/test/testcases/tests/level1/html/table46.xml.kfail +++ /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="table46"> -<metadata> -<title>table46</title> -<creator>Netscape</creator> -<description> -Offset of alignment character. -The value of attribute choff of the tablerow 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-6820..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vchoff" type="DOMString" /> -<var name="doc" type="Node"/> -<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="1"/> -<chOff interface="HTMLTableRowElement" obj="testNode" var="vchoff"/> -<assertEquals actual="vchoff" expected='"1"' id="choffLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table47.xml b/test/testcases/tests/level1/html/table47.xml new file mode 100644 index 0000000..4d8340b --- /dev/null +++ b/test/testcases/tests/level1/html/table47.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="table47"> +<metadata> +<title>table47</title> +<creator>Netscape</creator> +<description> +The index of this row, relative to the entire table. +The value of attribute rowIndex of the table 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-6734..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vrindex" type="int" /> +<var name="doc" type="Node"/> +<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="4"/> +<rowIndex interface="HTMLTableRowElement" obj="testNode" var="vrindex"/> +<assertEquals actual="vrindex" expected="2" id="rowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table47.xml.kfail b/test/testcases/tests/level1/html/table47.xml.kfail deleted file mode 100644 index 4d8340b..0000000 --- a/test/testcases/tests/level1/html/table47.xml.kfail +++ /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="table47"> -<metadata> -<title>table47</title> -<creator>Netscape</creator> -<description> -The index of this row, relative to the entire table. -The value of attribute rowIndex of the table 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-6734..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vrindex" type="int" /> -<var name="doc" type="Node"/> -<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="4"/> -<rowIndex interface="HTMLTableRowElement" obj="testNode" var="vrindex"/> -<assertEquals actual="vrindex" expected="2" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table48.xml b/test/testcases/tests/level1/html/table48.xml new file mode 100644 index 0000000..1910883 --- /dev/null +++ b/test/testcases/tests/level1/html/table48.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="table48"> +<metadata> +<title>HTMLTableColElement align</title> +<creator>Netscape</creator> +<description> +Horizontal alignment of cell data in column. +The value of attribute align of the tablecol 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-7409..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="valign" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecol" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<align interface="HTMLTableColElement" obj="testNode" var="valign"/> +<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table48.xml.kfail b/test/testcases/tests/level1/html/table48.xml.kfail deleted file mode 100644 index 1910883..0000000 --- a/test/testcases/tests/level1/html/table48.xml.kfail +++ /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="table48"> -<metadata> -<title>HTMLTableColElement align</title> -<creator>Netscape</creator> -<description> -Horizontal alignment of cell data in column. -The value of attribute align of the tablecol 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-7409..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="valign" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecol" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<align interface="HTMLTableColElement" obj="testNode" var="valign"/> -<assertEquals actual="valign" expected='"center"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table49.xml b/test/testcases/tests/level1/html/table49.xml new file mode 100644 index 0000000..1db690b --- /dev/null +++ b/test/testcases/tests/level1/html/table49.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="table49"> +<metadata> +<title>table49</title> +<creator>Netscape</creator> +<description> +Alignment character for cells in a column. +The value of attribute ch of the tablecol 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-1623..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vch" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecol" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<ch interface="HTMLTableColElement" obj="testNode" var="vch"/> +<assertEquals actual="vch" expected='"*"' id="chLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table49.xml.kfail b/test/testcases/tests/level1/html/table49.xml.kfail deleted file mode 100644 index 1db690b..0000000 --- a/test/testcases/tests/level1/html/table49.xml.kfail +++ /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="table49"> -<metadata> -<title>table49</title> -<creator>Netscape</creator> -<description> -Alignment character for cells in a column. -The value of attribute ch of the tablecol 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-1623..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vch" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecol" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<ch interface="HTMLTableColElement" obj="testNode" var="vch"/> -<assertEquals actual="vch" expected='"*"' id="chLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table50.xml b/test/testcases/tests/level1/html/table50.xml new file mode 100644 index 0000000..8f60638 --- /dev/null +++ b/test/testcases/tests/level1/html/table50.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="table50"> +<metadata> +<title>table50</title> +<creator>Netscape</creator> +<description> +Offset of alignment character. +The value of attribute choff of the tablecol 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-6820..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vchoff" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecol" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<chOff interface="HTMLTableColElement" obj="testNode" var="vchoff"/> +<assertEquals actual="vchoff" expected='"20"' id="chOffLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table50.xml.kfail b/test/testcases/tests/level1/html/table50.xml.kfail deleted file mode 100644 index 8f60638..0000000 --- a/test/testcases/tests/level1/html/table50.xml.kfail +++ /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="table50"> -<metadata> -<title>table50</title> -<creator>Netscape</creator> -<description> -Offset of alignment character. -The value of attribute choff of the tablecol 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-6820..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vchoff" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecol" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<chOff interface="HTMLTableColElement" obj="testNode" var="vchoff"/> -<assertEquals actual="vchoff" expected='"20"' id="chOffLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table51.xml b/test/testcases/tests/level1/html/table51.xml new file mode 100644 index 0000000..c917f27 --- /dev/null +++ b/test/testcases/tests/level1/html/table51.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="table51"> +<metadata> +<title>table51</title> +<creator>Netscape</creator> +<description> +Indicates the number of columns in a group or affected by a grouping. +The value of attribute span of the tablecol 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-9651..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vspan" type="int"/> +<var name="doc" type="Node"/> +<load var="doc" href="tablecol" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<span interface="HTMLTableColElement" obj="testNode" var="vspan"/> +<assertEquals actual="vspan" expected="1" id="spanLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table51.xml.kfail b/test/testcases/tests/level1/html/table51.xml.kfail deleted file mode 100644 index c917f27..0000000 --- a/test/testcases/tests/level1/html/table51.xml.kfail +++ /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="table51"> -<metadata> -<title>table51</title> -<creator>Netscape</creator> -<description> -Indicates the number of columns in a group or affected by a grouping. -The value of attribute span of the tablecol 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-9651..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vspan" type="int"/> -<var name="doc" type="Node"/> -<load var="doc" href="tablecol" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<span interface="HTMLTableColElement" obj="testNode" var="vspan"/> -<assertEquals actual="vspan" expected="1" id="spanLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table52.xml b/test/testcases/tests/level1/html/table52.xml new file mode 100644 index 0000000..bf94572 --- /dev/null +++ b/test/testcases/tests/level1/html/table52.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="table52"> +<metadata> +<title>table52</title> +<creator>Netscape</creator> +<description> +Vertical alignment of cell data in column. +The value of attribute valign of the tablecol 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-8329..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vvalign" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecol" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<vAlign interface="HTMLTableColElement" obj="testNode" var="vvalign"/> +<assertEquals actual="vvalign" expected='"middle"' id="vAlignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table52.xml.kfail b/test/testcases/tests/level1/html/table52.xml.kfail deleted file mode 100644 index bf94572..0000000 --- a/test/testcases/tests/level1/html/table52.xml.kfail +++ /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="table52"> -<metadata> -<title>table52</title> -<creator>Netscape</creator> -<description> -Vertical alignment of cell data in column. -The value of attribute valign of the tablecol 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-8329..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vvalign" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecol" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<vAlign interface="HTMLTableColElement" obj="testNode" var="vvalign"/> -<assertEquals actual="vvalign" expected='"middle"' id="vAlignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/table53.xml b/test/testcases/tests/level1/html/table53.xml new file mode 100644 index 0000000..210c7e1 --- /dev/null +++ b/test/testcases/tests/level1/html/table53.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="table53"> +<metadata> +<title>table53</title> +<creator>Netscape</creator> +<description> +Default column width. +The value of attribute width of the tablecol 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-2519..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vwidth" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="tablecol" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<width interface="HTMLTableColElement" obj="testNode" var="vwidth"/> +<assertEquals actual="vwidth" expected='"20"' id="widthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/table53.xml.kfail b/test/testcases/tests/level1/html/table53.xml.kfail deleted file mode 100644 index 210c7e1..0000000 --- a/test/testcases/tests/level1/html/table53.xml.kfail +++ /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="table53"> -<metadata> -<title>table53</title> -<creator>Netscape</creator> -<description> -Default column width. -The value of attribute width of the tablecol 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-2519..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vwidth" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="tablecol" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"col"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<width interface="HTMLTableColElement" obj="testNode" var="vwidth"/> -<assertEquals actual="vwidth" expected='"20"' id="widthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement34.xml b/test/testcases/tests/level2/html/HTMLTableElement34.xml new file mode 100644 index 0000000..d774498 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableElement34.xml @@ -0,0 +1,48 @@ +<?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="HTMLTableElement34"> +<metadata> +<title>HTMLTableElement34</title> +<creator>NIST</creator> +<description> + The insertRow() method throws a INDEX_SIZE_ERR DOMException + if the specified index is greater than the number of rows. + + Retrieve the second TABLE element which has four rows. Try + to insert a new row using an index of five. This should throw + a INDEX_SIZE_ERR DOMException since there are only four rows. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-39872903"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-39872903')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<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"/> +<assertDOMException id="HTMLTableElement34"> +<INDEX_SIZE_ERR> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="5"/> +</INDEX_SIZE_ERR> +</assertDOMException> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement34.xml.kfail b/test/testcases/tests/level2/html/HTMLTableElement34.xml.kfail deleted file mode 100644 index d774498..0000000 --- a/test/testcases/tests/level2/html/HTMLTableElement34.xml.kfail +++ /dev/null @@ -1,48 +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="HTMLTableElement34"> -<metadata> -<title>HTMLTableElement34</title> -<creator>NIST</creator> -<description> - The insertRow() method throws a INDEX_SIZE_ERR DOMException - if the specified index is greater than the number of rows. - - Retrieve the second TABLE element which has four rows. Try - to insert a new row using an index of five. This should throw - a INDEX_SIZE_ERR DOMException since there are only four rows. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-39872903"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-39872903')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<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"/> -<assertDOMException id="HTMLTableElement34"> -<INDEX_SIZE_ERR> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="5"/> -</INDEX_SIZE_ERR> -</assertDOMException> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement35.xml b/test/testcases/tests/level2/html/HTMLTableElement35.xml new file mode 100644 index 0000000..6410e89 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableElement35.xml @@ -0,0 +1,48 @@ +<?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="HTMLTableElement35"> +<metadata> +<title>HTMLTableElement35</title> +<creator>NIST</creator> +<description> + The insertRow() method throws a INDEX_SIZE_ERR DOMException + if the specified index is negative. + + Retrieve the second TABLE element which has four rows. Try + to insert a new row using an index of negative five. This should throw + a INDEX_SIZE_ERR DOMException since the index is negative. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-39872903"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-39872903')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<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"/> +<assertDOMException id="HTMLTableElement35"> +<INDEX_SIZE_ERR> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="-5"/> +</INDEX_SIZE_ERR> +</assertDOMException> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement35.xml.kfail b/test/testcases/tests/level2/html/HTMLTableElement35.xml.kfail deleted file mode 100644 index 6410e89..0000000 --- a/test/testcases/tests/level2/html/HTMLTableElement35.xml.kfail +++ /dev/null @@ -1,48 +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="HTMLTableElement35"> -<metadata> -<title>HTMLTableElement35</title> -<creator>NIST</creator> -<description> - The insertRow() method throws a INDEX_SIZE_ERR DOMException - if the specified index is negative. - - Retrieve the second TABLE element which has four rows. Try - to insert a new row using an index of negative five. This should throw - a INDEX_SIZE_ERR DOMException since the index is negative. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-39872903"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-39872903')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<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"/> -<assertDOMException id="HTMLTableElement35"> -<INDEX_SIZE_ERR> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="-5"/> -</INDEX_SIZE_ERR> -</assertDOMException> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement36.xml b/test/testcases/tests/level2/html/HTMLTableElement36.xml new file mode 100644 index 0000000..7a514e5 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableElement36.xml @@ -0,0 +1,47 @@ +<?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="HTMLTableElement36"> +<metadata> +<title>HTMLTableElement36</title> +<creator>NIST</creator> +<description> + The deleteRow() method throws a INDEX_SIZE_ERR DOMException + if the specified index is greater than the number of rows. + + Retrieve the second TABLE element which has four rows. Try + to delete a new row using an index of five. This should throw + a INDEX_SIZE_ERR DOMException since there are only four rows. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-13114938')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<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"/> +<assertDOMException id="HTMLTableElement36"> +<INDEX_SIZE_ERR> +<deleteRow interface="HTMLTableElement" obj="testNode" index="5"/> +</INDEX_SIZE_ERR> +</assertDOMException> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement36.xml.kfail b/test/testcases/tests/level2/html/HTMLTableElement36.xml.kfail deleted file mode 100644 index 7a514e5..0000000 --- a/test/testcases/tests/level2/html/HTMLTableElement36.xml.kfail +++ /dev/null @@ -1,47 +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="HTMLTableElement36"> -<metadata> -<title>HTMLTableElement36</title> -<creator>NIST</creator> -<description> - The deleteRow() method throws a INDEX_SIZE_ERR DOMException - if the specified index is greater than the number of rows. - - Retrieve the second TABLE element which has four rows. Try - to delete a new row using an index of five. This should throw - a INDEX_SIZE_ERR DOMException since there are only four rows. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-13114938')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<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"/> -<assertDOMException id="HTMLTableElement36"> -<INDEX_SIZE_ERR> -<deleteRow interface="HTMLTableElement" obj="testNode" index="5"/> -</INDEX_SIZE_ERR> -</assertDOMException> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement37.xml b/test/testcases/tests/level2/html/HTMLTableElement37.xml new file mode 100644 index 0000000..097deb1 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableElement37.xml @@ -0,0 +1,48 @@ +<?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="HTMLTableElement37"> +<metadata> +<title>HTMLTableElement37</title> +<creator>NIST</creator> +<description> + The deleteRow() method throws a INDEX_SIZE_ERR DOMException + if the specified index is equal the number of rows. + + Retrieve the second TABLE element which has four rows. Try + to delete a new row using an index of four. This should throw + a INDEX_SIZE_ERR DOMException since the index is equal to the + number of rows. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-13114938')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<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"/> +<assertDOMException id="HTMLTableElement37"> +<INDEX_SIZE_ERR> +<deleteRow interface="HTMLTableElement" obj="testNode" index="4"/> +</INDEX_SIZE_ERR> +</assertDOMException> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement37.xml.kfail b/test/testcases/tests/level2/html/HTMLTableElement37.xml.kfail deleted file mode 100644 index 097deb1..0000000 --- a/test/testcases/tests/level2/html/HTMLTableElement37.xml.kfail +++ /dev/null @@ -1,48 +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="HTMLTableElement37"> -<metadata> -<title>HTMLTableElement37</title> -<creator>NIST</creator> -<description> - The deleteRow() method throws a INDEX_SIZE_ERR DOMException - if the specified index is equal the number of rows. - - Retrieve the second TABLE element which has four rows. Try - to delete a new row using an index of four. This should throw - a INDEX_SIZE_ERR DOMException since the index is equal to the - number of rows. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-13114938')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<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"/> -<assertDOMException id="HTMLTableElement37"> -<INDEX_SIZE_ERR> -<deleteRow interface="HTMLTableElement" obj="testNode" index="4"/> -</INDEX_SIZE_ERR> -</assertDOMException> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement38.xml b/test/testcases/tests/level2/html/HTMLTableElement38.xml new file mode 100644 index 0000000..0f5bccd --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableElement38.xml @@ -0,0 +1,47 @@ +<?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="HTMLTableElement38"> +<metadata> +<title>HTMLTableElement38</title> +<creator>NIST</creator> +<description> + The deleteRow() method throws a INDEX_SIZE_ERR DOMException + if the specified index is negative. + + Retrieve the second TABLE element which has four rows. Try + to delete a new row using an index of negative five. This should throw + a INDEX_SIZE_ERR DOMException since the index is negative. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-13114938')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<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"/> +<assertDOMException id="HTMLTableElement38"> +<INDEX_SIZE_ERR> +<deleteRow interface="HTMLTableElement" obj="testNode" index="-5"/> +</INDEX_SIZE_ERR> +</assertDOMException> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement38.xml.kfail b/test/testcases/tests/level2/html/HTMLTableElement38.xml.kfail deleted file mode 100644 index 0f5bccd..0000000 --- a/test/testcases/tests/level2/html/HTMLTableElement38.xml.kfail +++ /dev/null @@ -1,47 +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="HTMLTableElement38"> -<metadata> -<title>HTMLTableElement38</title> -<creator>NIST</creator> -<description> - The deleteRow() method throws a INDEX_SIZE_ERR DOMException - if the specified index is negative. - - Retrieve the second TABLE element which has four rows. Try - to delete a new row using an index of negative five. This should throw - a INDEX_SIZE_ERR DOMException since the index is negative. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-13114938"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-13114938')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<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"/> -<assertDOMException id="HTMLTableElement38"> -<INDEX_SIZE_ERR> -<deleteRow interface="HTMLTableElement" obj="testNode" index="-5"/> -</INDEX_SIZE_ERR> -</assertDOMException> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableElement39.xml.kfail b/test/testcases/tests/level2/html/HTMLTableElement39.xml.kfail index 6631584..0a6fcfd 100644 --- a/test/testcases/tests/level2/html/HTMLTableElement39.xml.kfail +++ b/test/testcases/tests/level2/html/HTMLTableElement39.xml.kfail @@ -54,9 +54,14 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. <length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> <assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> <insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="-1"/> + +<!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/HTMLTableRowElement15.xml b/test/testcases/tests/level2/html/HTMLTableRowElement15.xml new file mode 100644 index 0000000..9e89674 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableRowElement15.xml @@ -0,0 +1,48 @@ +<?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="HTMLTableRowElement15"> +<metadata> +<title>HTMLTableRowElement15</title> +<creator>NIST</creator> +<description> + The insertCell() method throws a INDEX_SIZE_ERR DOMException + if the specified index is greater than the number of cells. + + Retrieve the fourth TR element which has six cells. Try + to insert a cell using an index of seven. This should throw + a INDEX_SIZE_ERR DOMException since there are only six cells. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-68927016"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-68927016')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newCell" type="HTMLElement"/> +<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"/> +<assertDOMException id="HTMLTableRowElement15"> +<INDEX_SIZE_ERR> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="7"/> +</INDEX_SIZE_ERR> +</assertDOMException> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement15.xml.kfail b/test/testcases/tests/level2/html/HTMLTableRowElement15.xml.kfail deleted file mode 100644 index 9e89674..0000000 --- a/test/testcases/tests/level2/html/HTMLTableRowElement15.xml.kfail +++ /dev/null @@ -1,48 +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="HTMLTableRowElement15"> -<metadata> -<title>HTMLTableRowElement15</title> -<creator>NIST</creator> -<description> - The insertCell() method throws a INDEX_SIZE_ERR DOMException - if the specified index is greater than the number of cells. - - Retrieve the fourth TR element which has six cells. Try - to insert a cell using an index of seven. This should throw - a INDEX_SIZE_ERR DOMException since there are only six cells. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-68927016"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-68927016')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newCell" type="HTMLElement"/> -<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"/> -<assertDOMException id="HTMLTableRowElement15"> -<INDEX_SIZE_ERR> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="7"/> -</INDEX_SIZE_ERR> -</assertDOMException> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement16.xml b/test/testcases/tests/level2/html/HTMLTableRowElement16.xml new file mode 100644 index 0000000..8471a2b --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableRowElement16.xml @@ -0,0 +1,48 @@ +<?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="HTMLTableRowElement16"> +<metadata> +<title>HTMLTableRowElement16</title> +<creator>NIST</creator> +<description> + The insertCell() method throws a INDEX_SIZE_ERR DOMException + if the specified index is negative. + + Retrieve the fourth TR element which has six cells. Try + to insert a cell using an index of negative seven. This should throw + a INDEX_SIZE_ERR DOMException since the index is negative. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-68927016"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-68927016')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newCell" type="HTMLElement"/> +<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"/> +<assertDOMException id="HTMLTableRowElement16"> +<INDEX_SIZE_ERR> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="-7"/> +</INDEX_SIZE_ERR> +</assertDOMException> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement16.xml.kfail b/test/testcases/tests/level2/html/HTMLTableRowElement16.xml.kfail deleted file mode 100644 index 8471a2b..0000000 --- a/test/testcases/tests/level2/html/HTMLTableRowElement16.xml.kfail +++ /dev/null @@ -1,48 +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="HTMLTableRowElement16"> -<metadata> -<title>HTMLTableRowElement16</title> -<creator>NIST</creator> -<description> - The insertCell() method throws a INDEX_SIZE_ERR DOMException - if the specified index is negative. - - Retrieve the fourth TR element which has six cells. Try - to insert a cell using an index of negative seven. This should throw - a INDEX_SIZE_ERR DOMException since the index is negative. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-68927016"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-68927016')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newCell" type="HTMLElement"/> -<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"/> -<assertDOMException id="HTMLTableRowElement16"> -<INDEX_SIZE_ERR> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="-7"/> -</INDEX_SIZE_ERR> -</assertDOMException> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement17.xml b/test/testcases/tests/level2/html/HTMLTableRowElement17.xml new file mode 100644 index 0000000..b469470 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableRowElement17.xml @@ -0,0 +1,47 @@ +<?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="HTMLTableRowElement17"> +<metadata> +<title>HTMLTableRowElement17</title> +<creator>NIST</creator> +<description> + The deleteCell() method throws a INDEX_SIZE_ERR DOMException + if the specified index is greater than the number of cells. + + Retrieve the fourth TR element which has six cells. Try + to delete a cell using an index of seven. This should throw + a INDEX_SIZE_ERR DOMException since there are only six cells. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-11738598"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-11738598')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<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"/> +<assertDOMException id="HTMLTableRowElement17"> +<INDEX_SIZE_ERR> +<deleteCell interface="HTMLTableRowElement" obj="testNode" index="7"/> +</INDEX_SIZE_ERR> +</assertDOMException> +</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement17.xml.kfail b/test/testcases/tests/level2/html/HTMLTableRowElement17.xml.kfail deleted file mode 100644 index b469470..0000000 --- a/test/testcases/tests/level2/html/HTMLTableRowElement17.xml.kfail +++ /dev/null @@ -1,47 +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="HTMLTableRowElement17"> -<metadata> -<title>HTMLTableRowElement17</title> -<creator>NIST</creator> -<description> - The deleteCell() method throws a INDEX_SIZE_ERR DOMException - if the specified index is greater than the number of cells. - - Retrieve the fourth TR element which has six cells. Try - to delete a cell using an index of seven. This should throw - a INDEX_SIZE_ERR DOMException since there are only six cells. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-11738598"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#xpointer(id('ID-11738598')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INDEX_SIZE_ERR'])"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<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"/> -<assertDOMException id="HTMLTableRowElement17"> -<INDEX_SIZE_ERR> -<deleteCell interface="HTMLTableRowElement" obj="testNode" index="7"/> -</INDEX_SIZE_ERR> -</assertDOMException> -</test> diff --git a/test/testcases/tests/level2/html/HTMLTableRowElement18.xml b/test/testcases/tests/level2/html/HTMLTableRowElement18.xml new file mode 100644 index 0000000..f296086 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLTableRowElement18.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits May 2014