diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/DOMTSHandler.pm | 16 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLImageElement01.xml (renamed from test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLImageElement02.xml (renamed from test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLImageElement03.xml (renamed from test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLImageElement04.xml (renamed from test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLImageElement07.xml (renamed from test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLImageElement08.xml (renamed from test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLImageElement09.xml (renamed from test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLImageElement10.xml (renamed from test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/.HTMLImageElement05.xml.swp | bin | 0 -> 12288 bytes | |||
-rw-r--r-- | test/testcases/tests/level2/html/HTMLImageElement05.xml (renamed from test/testcases/tests/level2/html/HTMLImageElement05.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/HTMLImageElement06.xml (renamed from test/testcases/tests/level2/html/HTMLImageElement06.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/HTMLImageElement11.xml (renamed from test/testcases/tests/level2/html/HTMLImageElement11.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/HTMLImageElement12.xml (renamed from test/testcases/tests/level2/html/HTMLImageElement12.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/files/img.html | 13 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/files/img.xhtml | 15 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/files/img.xml | 15 |
17 files changed, 55 insertions, 4 deletions
diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 645e841..6dfaae9 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -479,21 +479,29 @@ sub generate_load { my ($self, $a) = @_; my %ats = %$a; my $doc = $ats{"var"}; - $test_index ++; + my $var = $self->{"var"}; # define the test file path, use HTML if there is, otherwise using XML # Attention: I intend to copy the test files to the program excuting dir print "\tconst char *test$test_index = \"$ats{'href'}.html\";\n\n"; - print "\t$doc = load_html(test$test_index, $ats{'willBeModified'});"; + if ($var->{$doc} eq "Node") { + print "\t$doc = (dom_node*) load_html(test$test_index, $ats{'willBeModified'});"; + } else { + print "\t$doc = load_html(test$test_index, $ats{'willBeModified'});"; + } print "\tif ($doc == NULL) {\n"; $test_index ++; print "\t\tconst char *test$test_index = \"$ats{'href'}.xml\";\n\n"; - print "\t\t$doc = load_xml(test$test_index, $ats{'willBeModified'});\n"; + if ($var->{$doc} eq "Node") { + print "\t\t$doc = (dom_node *) load_xml(test$test_index, $ats{'willBeModified'});\n"; + } else { + print "\t\t$doc = load_xml(test$test_index, $ats{'willBeModified'});\n"; + } print "\t\tif ($doc == NULL)\n"; print "\t\t\treturn 1;\n"; print "\t\t}\n"; print << "__EOF__"; - exp = dom_document_get_implementation($doc, &doc_impl); + exp = dom_document_get_implementation((dom_document *) $doc, &doc_impl); if (exp != DOM_NO_ERR) return exp; __EOF__ diff --git a/test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement01.xml index ca61559..ca61559 100644 --- a/test/testcases/tests/level1/html/HTMLImageElement01.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLImageElement01.xml diff --git a/test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement02.xml index f314888..f314888 100644 --- a/test/testcases/tests/level1/html/HTMLImageElement02.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLImageElement02.xml diff --git a/test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement03.xml index 75716f9..75716f9 100644 --- a/test/testcases/tests/level1/html/HTMLImageElement03.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLImageElement03.xml diff --git a/test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement04.xml index 80a30b0..80a30b0 100644 --- a/test/testcases/tests/level1/html/HTMLImageElement04.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLImageElement04.xml diff --git a/test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement07.xml index faca09e..faca09e 100644 --- a/test/testcases/tests/level1/html/HTMLImageElement07.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLImageElement07.xml diff --git a/test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement08.xml index e7bedbf..e7bedbf 100644 --- a/test/testcases/tests/level1/html/HTMLImageElement08.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLImageElement08.xml diff --git a/test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement09.xml index 6d0f584..6d0f584 100644 --- a/test/testcases/tests/level1/html/HTMLImageElement09.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLImageElement09.xml diff --git a/test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail b/test/testcases/tests/level1/html/HTMLImageElement10.xml index 3c13080..3c13080 100644 --- a/test/testcases/tests/level1/html/HTMLImageElement10.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLImageElement10.xml diff --git a/test/testcases/tests/level2/html/.HTMLImageElement05.xml.swp b/test/testcases/tests/level2/html/.HTMLImageElement05.xml.swp Binary files differnew file mode 100644 index 0000000..6847879 --- /dev/null +++ b/test/testcases/tests/level2/html/.HTMLImageElement05.xml.swp diff --git a/test/testcases/tests/level2/html/HTMLImageElement05.xml.kfail b/test/testcases/tests/level2/html/HTMLImageElement05.xml index 92e536b..92e536b 100644 --- a/test/testcases/tests/level2/html/HTMLImageElement05.xml.kfail +++ b/test/testcases/tests/level2/html/HTMLImageElement05.xml diff --git a/test/testcases/tests/level2/html/HTMLImageElement06.xml.kfail b/test/testcases/tests/level2/html/HTMLImageElement06.xml index 19fb7b0..19fb7b0 100644 --- a/test/testcases/tests/level2/html/HTMLImageElement06.xml.kfail +++ b/test/testcases/tests/level2/html/HTMLImageElement06.xml diff --git a/test/testcases/tests/level2/html/HTMLImageElement11.xml.kfail b/test/testcases/tests/level2/html/HTMLImageElement11.xml index 10f3608..10f3608 100644 --- a/test/testcases/tests/level2/html/HTMLImageElement11.xml.kfail +++ b/test/testcases/tests/level2/html/HTMLImageElement11.xml diff --git a/test/testcases/tests/level2/html/HTMLImageElement12.xml.kfail b/test/testcases/tests/level2/html/HTMLImageElement12.xml index 738f1c3..738f1c3 100644 --- a/test/testcases/tests/level2/html/HTMLImageElement12.xml.kfail +++ b/test/testcases/tests/level2/html/HTMLImageElement12.xml diff --git a/test/testcases/tests/level2/html/files/img.html b/test/testcases/tests/level2/html/files/img.html new file mode 100644 index 0000000..b4e8b27 --- /dev/null +++ b/test/testcases/tests/level2/html/files/img.html @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML> +<HEAD> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8"> +<TITLE>NIST DOM HTML Test - IMG</TITLE> +</HEAD> +<BODY onload="parent.loadComplete()"> +<P> +<IMG ID="IMAGE-1" NAME="IMAGE-1" SRC="./pix/dts.gif" ALIGN="middle" ALT="DTS IMAGE LOGO" BORDER="0" HEIGHT="47" HSPACE="4" LONGDESC="./files/desc.html" USEMAP="#DTS-MAP" VSPACE="10" WIDTH="115"/> +</P> +</BODY> +</HTML> + diff --git a/test/testcases/tests/level2/html/files/img.xhtml b/test/testcases/tests/level2/html/files/img.xhtml new file mode 100644 index 0000000..40e3695 --- /dev/null +++ b/test/testcases/tests/level2/html/files/img.xhtml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - IMG</title> +</head> +<body onload="parent.loadComplete()"> +<p> +<img id="IMAGE-1" name="IMAGE-1" src="./pix/dts.gif" align="middle" alt="DTS IMAGE LOGO" border="0" height="47" hspace="4" longdesc="./files/desc.html" usemap="#DTS-MAP" vspace="10" width="115"/> +</p> +</body> +</html> + diff --git a/test/testcases/tests/level2/html/files/img.xml b/test/testcases/tests/level2/html/files/img.xml new file mode 100644 index 0000000..40e3695 --- /dev/null +++ b/test/testcases/tests/level2/html/files/img.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - IMG</title> +</head> +<body onload="parent.loadComplete()"> +<p> +<img id="IMAGE-1" name="IMAGE-1" src="./pix/dts.gif" align="middle" alt="DTS IMAGE LOGO" border="0" height="47" hspace="4" longdesc="./files/desc.html" usemap="#DTS-MAP" vspace="10" width="115"/> +</p> +</body> +</html> + |