Menu
▾
▴
[HtmlUnit] SVN: [8361] trunk/htmlunit/src
|
From: <rb...@us...> - 2013-06-30 12:44:20
|
Revision: 8361
http://sourceforge.net/p/htmlunit/code/8361
Author: rbri
Date: 2013-06-30 12:44:17 +0000 (Sun, 30 Jun 2013)
Log Message:
-----------
adjust expectations for IE8
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2013-06-30 12:18:56 UTC (rev 8360)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2013-06-30 12:44:17 UTC (rev 8361)
@@ -122,8 +122,10 @@
map.put("A", "inline");
map.put("ABBR", "inline");
map.put("ACRONYM", "inline");
- map.put("AREA", "none");
- map.put("AUDIO", "none");
+ map.put("AREA", "inline");
+ map.put("ARTICLE", "inline");
+ map.put("ASIDE", "inline");
+ map.put("AUDIO", "inline");
map.put("B", "inline");
map.put("BDO", "inline");
map.put("BIG", "inline");
@@ -139,12 +141,24 @@
map.put("DFN", "inline");
map.put("EM", "inline");
map.put("EMBED", "inline");
+ map.put("FIGCAPTION", "inline");
+ map.put("FIGURE", "inline");
map.put("FONT", "inline");
+ map.put("FOOTER", "inline");
+ map.put("HEADER", "inline");
map.put("SPAN", "inline");
DEFAULT_DISPLAYS = Collections.unmodifiableMap(map);
map = new HashMap<String, String>(map);
+ map.put("AREA", "none");
+ map.put("ARTICLE", "block");
+ map.put("ASIDE", "block");
+ map.put("AUDIO", "none");
map.put("CODE", "inline");
+ map.put("FIGCAPTION", "block");
+ map.put("FIGURE", "block");
+ map.put("FOOTER", "block");
+ map.put("HEADER", "block");
map.put("SPAN", "inline");
map.put("LI", "list-item");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2013-06-30 12:18:56 UTC (rev 8360)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2013-06-30 12:44:17 UTC (rev 8361)
@@ -246,10 +246,10 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(FF = { "inline", "inline", "inline", "block", /* "inline-block", */ "none", "block", "block", "none" },
- IE = { "inline", "inline", "inline", "block", /* "none", */ "inline", "block", "block", "none" })
+ @Alerts(DEFAULT = { "inline", "inline", "inline", "block", /* "inline-block", */ "none", "block", "block", "none" },
+ IE = { "inline", "inline", "inline", "block", /* "none", */ "inline", "inline", "inline", "inline" })
public void defaultDisplayValues_A() throws Exception {
- final String html = "<html><body>\n"
+ final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <p id='p'>\n"
+ " <a id='a'></a>\n"
+ " <abbr id='abbr'></abbr>\n"
@@ -295,7 +295,7 @@
@Test
@Alerts({ "inline", "inline", "inline", "block", "inline", "inline-block" })
public void defaultDisplayValues_B() throws Exception {
- final String html = "<html><body>\n"
+ final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <p id='p'>\n"
+ " <b id='b'></b>\n"
// + " <bdi id='bdi'></bdi>\n"
@@ -332,7 +332,7 @@
@Test
@Alerts({ "inline", "table-caption", "block", "inline", "inline", "table-column", "table-column-group" })
public void defaultDisplayValues_C() throws Exception {
- final String html = "<html><body>\n"
+ final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <canvas id='canvas'></canvas>\n"
+ " <center id='center'></center>\n"
+ " <code id='code'></code>\n"
@@ -378,7 +378,7 @@
@Test
@Alerts({ "block", "inline", "inline", "block", "block", "block", "block" })
public void defaultDisplayValues_D() throws Exception {
- final String html = "<html><body>\n"
+ final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <datalist id='datalist'></datalist>\n"
+ " <dl id='dl'>\n"
@@ -425,7 +425,7 @@
@Test
@Alerts({ "inline", "inline" })
public void defaultDisplayValues_E() throws Exception {
- final String html = "<html><body>\n"
+ final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <p id='p'>\n"
+ " <em id='em'></em>\n"
+ " </p>\n"
@@ -451,9 +451,10 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts({ "block", "block", "block", "inline", "block", "block" })
+ @Alerts(DEFAULT = { "block", "block", "block", "inline", "block", "block" },
+ IE = { "block", "inline", "inline", "inline", "inline", "block" })
public void defaultDisplayValues_F() throws Exception {
- final String html = "<html><body>\n"
+ final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <form id='form'>\n"
+ " <fieldset id='fieldset'></fieldset>\n"
+ " </form>\n"
@@ -491,9 +492,10 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts({ "block", "block", "block", "block", "block", "block", "block", "block" })
+ @Alerts(DEFAULT = { "block", "block", "block", "block", "block", "block", "block", "block" },
+ IE = { "block", "block", "block", "block", "block", "block", "inline", "block" })
public void defaultDisplayValues_H() throws Exception {
- final String html = "<html><body>\n"
+ final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <h1 id='h1'></h1>\n"
+ " <h2 id='h2'></h2>\n"
+ " <h3 id='h3'></h3>\n"
|
