[HtmlUnit] SVN: [8749] trunk/htmlunit/src

[<rb...@us...>]

Revision: 8749
          http://sourceforge.net/p/htmlunit/code/8749
Author:   rbri
Date:     2013-11-07 19:14:01 +0000 (Thu, 07 Nov 2013)
Log Message:
-----------
fix ff17 expectation

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
    trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.FF17.txt

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2013-11-06 21:51:00 UTC (rev 8748)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java	2013-11-07 19:14:01 UTC (rev 8749)
@@ -1722,7 +1722,7 @@
      */
     @JsxGetter(@WebBrowser(FF))
     public int getMozInnerScreenX() {
-        return 0;
+        return 8;
     }
 
     /**
@@ -1731,7 +1731,7 @@
      */
     @JsxGetter(@WebBrowser(FF))
     public int getMozInnerScreenY() {
-        return 82;
+        return 91;
     }
 
     /**
@@ -1740,7 +1740,7 @@
      */
     @JsxGetter(@WebBrowser(FF))
     public int getMozPaintCount() {
-        return 23;
+        return 0;
     }
 
     /** Definition of special cases for the smart DomHtmlAttributeChangeListenerImpl **/

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java	2013-11-06 21:51:00 UTC (rev 8748)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java	2013-11-07 19:14:01 UTC (rev 8749)
@@ -355,7 +355,7 @@
 
         /** The style property -moz-perspective-origin. */
         MOZ_PERSPECTIVE_ORIGIN("MozPerspectiveOrigin",
-                "-moz-perspective-origin", ff17up("628px 170px")),
+                "-moz-perspective-origin", ff17up("624px 171px")),
 
         /** The style property -moz-stack-sizing. */
         MOZ_STACK_SIZING("MozStackSizing", "-moz-stack-sizing",
@@ -392,7 +392,7 @@
 
         /** The style property -moz-transform-origin. */
         MOZ_TRANSFORM_ORIGIN("MozTransformOrigin", "-moz-transform-origin",
-                ffBelow17("50% 50%"), ff("628px 170px")),
+                ffBelow17("50% 50%"), ff("624px 171px")),
 
         /** The style property -moz-transform-style. */
         MOZ_TRANSFORM_STYLE("MozTransformStyle", "-moz-transform-style",
@@ -958,8 +958,8 @@
         LINE_BREAK("lineBreak", "line-break", ie10up("undefined")),
 
         /** The style property line-height. */
-        LINE_HEIGHT("lineHeight", "line-height", ff17up("19px"),
-                ffBelow17("20px"), ieBelow10("20px"), ie10up("normal")),
+        LINE_HEIGHT("lineHeight", "line-height",
+                ff("20px"), ieBelow10("20px"), ie10up("normal")),
 
         /** The style property marker. */
         MARKER("marker", "marker", ff17up(""), ie10up("none")),
@@ -1005,7 +1005,7 @@
 
         /** The style property perspective-origin. */
         PERSPECTIVE_ORIGIN("perspectiveOrigin", "perspective-origin",
-                ff17up("628px 170px"), ie10up("620px 163.2px")),
+                ff17up("624px 171px"), ie10up("620px 163.2px")),
 
         /** The style property pointer-events. */
         POINTER_EVENTS("pointerEvents", "pointer-events", ie10up("visiblePainted")),
@@ -1147,7 +1147,7 @@
 
         /** The style property transform-origin. */
         TRANSFORM_ORIGIN("transformOrigin", "transform-origin",
-                ff17up("628px 170px"), ie10up("620px 163.2px")),
+                ff17up("624px 171px"), ie10up("620px 163.2px")),
 
         /** The style property transform-style. */
         TRANSFORM_STYLE("transformStyle", "transform-style", ff17up("flat"), ie10up("flat")),

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java	2013-11-06 21:51:00 UTC (rev 8748)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java	2013-11-07 19:14:01 UTC (rev 8749)
@@ -785,8 +785,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(FF = { "0", "82", "23" },
-            FF24 = { "8", "91", "0" },
+    @Alerts(FF = { "8", "91", "0" },
             IE = { "undefined", "undefined", "undefined" })
     public void mozInnerScreenX() throws Exception {
         final String html

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-11-06 21:51:00 UTC (rev 8748)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java	2013-11-07 19:14:01 UTC (rev 8749)
@@ -15,8 +15,7 @@
 package com.gargoylesoftware.htmlunit.javascript.host.css;
 
 import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.FF;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.FF24;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE;
+import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.FF17;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE10;
 import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE8;
 
@@ -171,9 +170,9 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Browsers({ IE, FF24 })
     @Alerts(IE = { "0", "number" },
             IE10 = { "auto", "string" })
+    @NotYetImplemented(FF17)
     public void zIndex() throws Exception {
         final String html = "<html>\n"
             + "<head>\n"

Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.FF17.txt
===================================================================
--- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.FF17.txt	2013-11-06 21:51:00 UTC (rev 8748)
+++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.FF17.txt	2013-11-07 19:14:01 UTC (rev 8749)
@@ -1,260 +1,260 @@
-MozAnimation=:
-MozAnimationDelay=:0s
-MozAnimationDirection=:normal
-MozAnimationDuration=:0s
-MozAnimationFillMode=:none
-MozAnimationIterationCount=:1
-MozAnimationName=:none
-MozAnimationPlayState=:running
-MozAnimationTimingFunction=:cubic-bezier(0.25, 0.1, 0.25, 1)
-MozAppearance=:none
-MozBackfaceVisibility=:visible
-MozBackgroundInlinePolicy=:continuous
-MozBinding=:none
-MozBorderBottomColors=:none
-MozBorderEnd=:
-MozBorderEndColor=:
-MozBorderEndStyle=:
-MozBorderEndWidth=:
-MozBorderImage=:
-MozBorderLeftColors=:none
-MozBorderRightColors=:none
-MozBorderStart=:
-MozBorderStartColor=:
-MozBorderStartStyle=:
-MozBorderStartWidth=:
-MozBorderTopColors=:none
-MozBoxAlign=:stretch
-MozBoxDirection=:normal
-MozBoxFlex=:0
-MozBoxOrdinalGroup=:1
-MozBoxOrient=:horizontal
-MozBoxPack=:start
-MozBoxSizing=:content-box
-MozColumnCount=:auto
-MozColumnGap=:16px
-MozColumnRule=:
-MozColumnRuleColor=:rgb(0, 0, 0)
-MozColumnRuleStyle=:none
-MozColumnRuleWidth=:0px
-MozColumnWidth=:auto
-MozColumns=:
-MozFloatEdge=:content-box
-MozFontFeatureSettings=:normal
-MozFontLanguageOverride=:normal
-MozForceBrokenImageIcon=:0
-MozHyphens=:manual
-MozImageRegion=:auto
-MozMarginEnd=:
-MozMarginStart=:
-MozOrient=:horizontal
-MozOutlineRadius=:
-MozOutlineRadiusBottomleft=:0px
-MozOutlineRadiusBottomright=:0px
-MozOutlineRadiusTopleft=:0px
-MozOutlineRadiusTopright=:0px
-MozPaddingEnd=:
-MozPaddingStart=:
-MozPerspective=:none
-MozPerspectiveOrigin=:628px 170px
-MozStackSizing=:stretch-to-fit
-MozTabSize=:8
-MozTextAlignLast=:auto
-MozTextBlink=:none
-MozTextDecorationColor=:rgb(0, 0, 0)
-MozTextDecorationLine=:none
-MozTextDecorationStyle=:solid
-MozTextSizeAdjust=:auto
-MozTransform=:none
-MozTransformOrigin=:628px 170px
-MozTransformStyle=:flat
-MozTransition=:
-MozTransitionDelay=:0s
-MozTransitionDuration=:0s
-MozTransitionProperty=:all
-MozTransitionTimingFunction=:cubic-bezier(0.25, 0.1, 0.25, 1)
-MozUserFocus=:none
-MozUserInput=:auto
-MozUserModify=:read-only
-MozUserSelect=:auto
-MozWindowShadow=:default
-animation=:
-animationDelay=:0s
-animationDirection=:normal
-animationDuration=:0s
-animationFillMode=:none
-animationIterationCount=:1
-animationName=:none
-animationPlayState=:running
-animationTimingFunction=:cubic-bezier(0.25, 0.1, 0.25, 1)
-backfaceVisibility=:visible
-background=:
-backgroundAttachment=:scroll
-backgroundClip=:border-box
-backgroundColor=:transparent
-backgroundImage=:none
-backgroundOrigin=:padding-box
-backgroundPosition=:0% 0%
-backgroundRepeat=:repeat
-backgroundSize=:auto auto
-border=:
-borderBottom=:
-borderBottomColor=:rgb(0, 0, 0)
-borderBottomLeftRadius=:0px
-borderBottomRightRadius=:0px
-borderBottomStyle=:none
-borderBottomWidth=:0px
-borderCollapse=:separate
-borderColor=:
-borderImage=:
-borderImageOutset=:0 0 0 0
-borderImageRepeat=:stretch stretch
-borderImageSlice=:100% 100% 100% 100%
-borderImageSource=:none
-borderImageWidth=:1 1 1 1
-borderLeft=:
-borderLeftColor=:rgb(0, 0, 0)
-borderLeftStyle=:none
-borderLeftWidth=:0px
-borderRadius=:
-borderRight=:
-borderRightColor=:rgb(0, 0, 0)
-borderRightStyle=:none
-borderRightWidth=:0px
-borderSpacing=:0px 0px
-borderStyle=:
-borderTop=:
-borderTopColor=:rgb(0, 0, 0)
-borderTopLeftRadius=:0px
-borderTopRightRadius=:0px
-borderTopStyle=:none
-borderTopWidth=:0px
-borderWidth=:
-bottom=:auto
-boxShadow=:none
-captionSide=:top
-clear=:none
-clip=:auto
-clipPath=:none
-clipRule=:nonzero
-color=:rgb(0, 0, 0)
-colorInterpolation=:srgb
-colorInterpolationFilters=:linearrgb
-content=:none
-counterIncrement=:none
-counterReset=:none
-cssFloat=:none
-cssText=:
-cursor=:auto
-direction=:ltr
-display=:block
-dominantBaseline=:auto
-emptyCells=:-moz-show-background
-fill=:rgb(0, 0, 0)
-fillOpacity=:1
-fillRule=:nonzero
-filter=:none
-floodColor=:rgb(0, 0, 0)
-floodOpacity=:1
-font=:
-fontFamily=:serif
-fontSize=:16px
-fontSizeAdjust=:none
-fontStretch=:normal
-fontStyle=:normal
-fontVariant=:normal
-fontWeight=:400
-height=:skipped
-imageRendering=:auto
-imeMode=:auto
-left=:auto
-letterSpacing=:normal
-lightingColor=:rgb(255, 255, 255)
-lineHeight=:19px
-listStyle=:
-listStyleImage=:none
-listStylePosition=:outside
-listStyleType=:disc
-margin=:
-marginBottom=:0px
-marginLeft=:0px
-marginRight=:0px
-marginTop=:0px
-marker=:
-markerEnd=:none
-markerMid=:none
-markerOffset=:auto
-markerStart=:none
-marks=:
-mask=:none
-maxHeight=:none
-maxWidth=:none
-minHeight=:0px
-minWidth=:0px
-opacity=:1
-orphans=:
-outline=:
-outlineColor=:rgb(0, 0, 0)
-outlineOffset=:0px
-outlineStyle=:none
-outlineWidth=:0px
-overflow=:visible
-overflowX=:visible
-overflowY=:visible
-padding=:
-paddingBottom=:0px
-paddingLeft=:0px
-paddingRight=:0px
-paddingTop=:0px
-page=:
-pageBreakAfter=:auto
-pageBreakBefore=:auto
-pageBreakInside=:
-perspective=:none
-perspectiveOrigin=:628px 170px
-pointerEvents=:auto
-position=:static
-quotes=:"“" "”" "‘" "’"
-resize=:none
-right=:auto
-shapeRendering=:auto
-size=:
-stopColor=:rgb(0, 0, 0)
-stopOpacity=:1
-stroke=:none
-strokeDasharray=:none
-strokeDashoffset=:0px
-strokeLinecap=:butt
-strokeLinejoin=:miter
-strokeMiterlimit=:4
-strokeOpacity=:1
-strokeWidth=:1px
-tableLayout=:auto
-textAlign=:start
-textAnchor=:start
-textDecoration=:none
-textIndent=:0px
-textOverflow=:clip
-textRendering=:auto
-textShadow=:none
-textTransform=:none
-top=:auto
-transform=:none
-transformOrigin=:628px 170px
-transformStyle=:flat
-transition=:
-transitionDelay=:0s
-transitionDuration=:0s
-transitionProperty=:all
-transitionTimingFunction=:cubic-bezier(0.25, 0.1, 0.25, 1)
-unicodeBidi=:-moz-isolate
-vectorEffect=:none
-verticalAlign=:baseline
-visibility=:visible
-whiteSpace=:normal
-widows=:
-width=:skipped
-wordBreak=:normal
-wordSpacing=:0px
-wordWrap=:normal
+MozAnimation=:
+MozAnimationDelay=:0s
+MozAnimationDirection=:normal
+MozAnimationDuration=:0s
+MozAnimationFillMode=:none
+MozAnimationIterationCount=:1
+MozAnimationName=:none
+MozAnimationPlayState=:running
+MozAnimationTimingFunction=:cubic-bezier(0.25, 0.1, 0.25, 1)
+MozAppearance=:none
+MozBackfaceVisibility=:visible
+MozBackgroundInlinePolicy=:continuous
+MozBinding=:none
+MozBorderBottomColors=:none
+MozBorderEnd=:
+MozBorderEndColor=:
+MozBorderEndStyle=:
+MozBorderEndWidth=:
+MozBorderImage=:
+MozBorderLeftColors=:none
+MozBorderRightColors=:none
+MozBorderStart=:
+MozBorderStartColor=:
+MozBorderStartStyle=:
+MozBorderStartWidth=:
+MozBorderTopColors=:none
+MozBoxAlign=:stretch
+MozBoxDirection=:normal
+MozBoxFlex=:0
+MozBoxOrdinalGroup=:1
+MozBoxOrient=:horizontal
+MozBoxPack=:start
+MozBoxSizing=:content-box
+MozColumnCount=:auto
+MozColumnGap=:16px
+MozColumnRule=:
+MozColumnRuleColor=:rgb(0, 0, 0)
+MozColumnRuleStyle=:none
+MozColumnRuleWidth=:0px
+MozColumnWidth=:auto
+MozColumns=:
+MozFloatEdge=:content-box
+MozFontFeatureSettings=:normal
+MozFontLanguageOverride=:normal
+MozForceBrokenImageIcon=:0
+MozHyphens=:manual
+MozImageRegion=:auto
+MozMarginEnd=:
+MozMarginStart=:
+MozOrient=:horizontal
+MozOutlineRadius=:
+MozOutlineRadiusBottomleft=:0px
+MozOutlineRadiusBottomright=:0px
+MozOutlineRadiusTopleft=:0px
+MozOutlineRadiusTopright=:0px
+MozPaddingEnd=:
+MozPaddingStart=:
+MozPerspective=:none
+MozPerspectiveOrigin=:624px 171px
+MozStackSizing=:stretch-to-fit
+MozTabSize=:8
+MozTextAlignLast=:auto
+MozTextBlink=:none
+MozTextDecorationColor=:rgb(0, 0, 0)
+MozTextDecorationLine=:none
+MozTextDecorationStyle=:solid
+MozTextSizeAdjust=:auto
+MozTransform=:none
+MozTransformOrigin=:624px 171px
+MozTransformStyle=:flat
+MozTransition=:
+MozTransitionDelay=:0s
+MozTransitionDuration=:0s
+MozTransitionProperty=:all
+MozTransitionTimingFunction=:cubic-bezier(0.25, 0.1, 0.25, 1)
+MozUserFocus=:none
+MozUserInput=:auto
+MozUserModify=:read-only
+MozUserSelect=:auto
+MozWindowShadow=:default
+animation=:
+animationDelay=:0s
+animationDirection=:normal
+animationDuration=:0s
+animationFillMode=:none
+animationIterationCount=:1
+animationName=:none
+animationPlayState=:running
+animationTimingFunction=:cubic-bezier(0.25, 0.1, 0.25, 1)
+backfaceVisibility=:visible
+background=:
+backgroundAttachment=:scroll
+backgroundClip=:border-box
+backgroundColor=:transparent
+backgroundImage=:none
+backgroundOrigin=:padding-box
+backgroundPosition=:0% 0%
+backgroundRepeat=:repeat
+backgroundSize=:auto auto
+border=:
+borderBottom=:
+borderBottomColor=:rgb(0, 0, 0)
+borderBottomLeftRadius=:0px
+borderBottomRightRadius=:0px
+borderBottomStyle=:none
+borderBottomWidth=:0px
+borderCollapse=:separate
+borderColor=:
+borderImage=:
+borderImageOutset=:0 0 0 0
+borderImageRepeat=:stretch stretch
+borderImageSlice=:100% 100% 100% 100%
+borderImageSource=:none
+borderImageWidth=:1 1 1 1
+borderLeft=:
+borderLeftColor=:rgb(0, 0, 0)
+borderLeftStyle=:none
+borderLeftWidth=:0px
+borderRadius=:
+borderRight=:
+borderRightColor=:rgb(0, 0, 0)
+borderRightStyle=:none
+borderRightWidth=:0px
+borderSpacing=:0px 0px
+borderStyle=:
+borderTop=:
+borderTopColor=:rgb(0, 0, 0)
+borderTopLeftRadius=:0px
+borderTopRightRadius=:0px
+borderTopStyle=:none
+borderTopWidth=:0px
+borderWidth=:
+bottom=:auto
+boxShadow=:none
+captionSide=:top
+clear=:none
+clip=:auto
+clipPath=:none
+clipRule=:nonzero
+color=:rgb(0, 0, 0)
+colorInterpolation=:srgb
+colorInterpolationFilters=:linearrgb
+content=:none
+counterIncrement=:none
+counterReset=:none
+cssFloat=:none
+cssText=:
+cursor=:auto
+direction=:ltr
+display=:block
+dominantBaseline=:auto
+emptyCells=:-moz-show-background
+fill=:rgb(0, 0, 0)
+fillOpacity=:1
+fillRule=:nonzero
+filter=:none
+floodColor=:rgb(0, 0, 0)
+floodOpacity=:1
+font=:
+fontFamily=:serif
+fontSize=:16px
+fontSizeAdjust=:none
+fontStretch=:normal
+fontStyle=:normal
+fontVariant=:normal
+fontWeight=:400
+height=:skipped
+imageRendering=:auto
+imeMode=:auto
+left=:auto
+letterSpacing=:normal
+lightingColor=:rgb(255, 255, 255)
+lineHeight=:20px
+listStyle=:
+listStyleImage=:none
+listStylePosition=:outside
+listStyleType=:disc
+margin=:
+marginBottom=:0px
+marginLeft=:0px
+marginRight=:0px
+marginTop=:0px
+marker=:
+markerEnd=:none
+markerMid=:none
+markerOffset=:auto
+markerStart=:none
+marks=:
+mask=:none
+maxHeight=:none
+maxWidth=:none
+minHeight=:0px
+minWidth=:0px
+opacity=:1
+orphans=:
+outline=:
+outlineColor=:rgb(0, 0, 0)
+outlineOffset=:0px
+outlineStyle=:none
+outlineWidth=:0px
+overflow=:visible
+overflowX=:visible
+overflowY=:visible
+padding=:
+paddingBottom=:0px
+paddingLeft=:0px
+paddingRight=:0px
+paddingTop=:0px
+page=:
+pageBreakAfter=:auto
+pageBreakBefore=:auto
+pageBreakInside=:
+perspective=:none
+perspectiveOrigin=:624px 171px
+pointerEvents=:auto
+position=:static
+quotes=:"“" "”" "‘" "’"
+resize=:none
+right=:auto
+shapeRendering=:auto
+size=:
+stopColor=:rgb(0, 0, 0)
+stopOpacity=:1
+stroke=:none
+strokeDasharray=:none
+strokeDashoffset=:0px
+strokeLinecap=:butt
+strokeLinejoin=:miter
+strokeMiterlimit=:4
+strokeOpacity=:1
+strokeWidth=:1px
+tableLayout=:auto
+textAlign=:start
+textAnchor=:start
+textDecoration=:none
+textIndent=:0px
+textOverflow=:clip
+textRendering=:auto
+textShadow=:none
+textTransform=:none
+top=:auto
+transform=:none
+transformOrigin=:624px 171px
+transformStyle=:flat
+transition=:
+transitionDelay=:0s
+transitionDuration=:0s
+transitionProperty=:all
+transitionTimingFunction=:cubic-bezier(0.25, 0.1, 0.25, 1)
+unicodeBidi=:-moz-isolate
+vectorEffect=:none
+verticalAlign=:baseline
+visibility=:visible
+whiteSpace=:normal
+widows=:
+width=:skipped
+wordBreak=:normal
+wordSpacing=:0px
+wordWrap=:normal
 zIndex=:auto
\ No newline at end of file