Menu
▾
▴
[HtmlUnit] SVN: [8649] trunk/htmlunit/src
|
From: <asa...@us...> - 2013-10-11 06:24:12
|
Revision: 8649
http://sourceforge.net/p/htmlunit/code/8649
Author: asashour
Date: 2013-10-11 06:24:05 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
- BrowserVersion: remove deprecated FIREFOX_3_6, FIREFOX_10, CHROME_16, INTERNET_EXPLORER_6 and INTERNET_EXPLORER_7.
- HtmlElement: remove deprecated getElementById() and .hasHtmlElementWithId(), and remove UrlUtils.encodeUrl().
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/UrlUtils.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionClassRunner.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/DomDocumentFragmentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLElementsTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlBaseFontTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlBaseTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlBreakTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButton2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButtonInput2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCanvasTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCaptionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlDefinitionListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlDirectoryTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlDivision2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlEmbedTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFieldSetTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInput2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFontTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlHeadTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlHeading2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlHiddenInputTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlHorizontalRuleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInput2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlIsIndex2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLabel2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLegendTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlListItemTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlMapTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlMenuTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlNoScriptTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOption2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlParameterTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPreformattedTextTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlProgressTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlResetInput2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlScript2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSubmitInputTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTable2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTableColumnTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlTitle2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlUnknownElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlWordBreakTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/IEConditionalCommentExpressionEvaluatorTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/IEConditionalCommentsTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/MalformedHtmlTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/IEConditionalCompilationTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeDateTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeFunctionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeGlobalTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/AttrTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/CDATASectionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/CommentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ConsoleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Document2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentFragmentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentTypeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Event2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/EventNodeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/EventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MimeTypeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MouseEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MutationEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NamedNodeMap2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NamedNodeMapTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NetscapeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NodeFilterTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NodeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ObjectsTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/PropertiesTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/RangeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SVGTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SelectionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/StorageTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/TextTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/TreeWalkerTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowConcurrencyTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/XPathEvaluatorTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferViewTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/DataViewTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSMediaRuleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSSelectorTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclarationTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleRuleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheetTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleSheetListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMExceptionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementationTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMStringMapTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBaseFontElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBodyElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCanvasElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCollectionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDListElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDirectoryElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDivElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentWrite2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFieldSetElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHRElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLHtmlElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLegendElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMediaElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMenuElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOListElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpanElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCellElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableColElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableRowElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableSectionElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUListElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLVideoElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAngleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGSVGElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocument2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLDocumentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLSerializerTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/mozilla/js1_2/AlphanumericTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/mozilla/js1_2/DigitTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/mozilla/js1_2/SimpleFormTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/mozilla/js1_2/StringSplitTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/libraries/GWT250Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/libraries/JQuery182Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/libraries/TinyMceTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgAnchorTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgCircleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgClipPathTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgDefsTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgDescTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgEllipseTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeBlendTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeColorMatrixTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeComponentTransferTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeCompositeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeConvolveMatrixTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeDiffuseLightingTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeDisplacementMapTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeDistantLightTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeFloodTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeFuncATest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeFuncBTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeFuncGTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeFuncRTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeGaussianBlurTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeImageTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeMergeNodeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeMergeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeMorphologyTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeOffsetTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFePointLightTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeSpecularLightingTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeSpotLightTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeTileTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFeTurbulenceTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgFilterTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgGroupTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgImageTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgLineTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgLinearGradientTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgMarkerTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgMaskTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgMatrixTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgMetadataTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgPathTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgPatternTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgPolygonTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgPolylineTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgRadialGradientTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgRectTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgScriptTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgStopTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgStyleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgSvgTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgSwitchTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgSymbolTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgTSpanTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgTextPathTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgTextTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgTitleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgUseTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/xml/XmlPage2Test.java
Removed Paths:
-------------
trunk/htmlunit/src/test/resources/objects/objects.FF10.txt
trunk/htmlunit/src/test/resources/objects/objects.FF3.6.txt
trunk/htmlunit/src/test/resources/objects/objects.IE6.txt
trunk/htmlunit/src/test/resources/objects/objects.IE7.txt
trunk/htmlunit/src/test/resources/objects/properties.FF10.txt
trunk/htmlunit/src/test/resources/objects/properties.FF3.6.txt
trunk/htmlunit/src/test/resources/objects/properties.IE6.txt
trunk/htmlunit/src/test/resources/objects/properties.IE7.txt
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/changes/changes.xml 2013-10-11 06:24:05 UTC (rev 8649)
@@ -8,6 +8,14 @@
<body>
<release version="2.14" date="???" description="Bugfixes">
+ <action type="remove" dev="asashour">
+ BrowserVersion: remove deprecated FIREFOX_3_6, FIREFOX_10, CHROME_16, INTERNET_EXPLORER_6
+ and INTERNET_EXPLORER_7.
+ </action>
+ <action type="remove" dev="asashour">
+ HtmlElement: remove deprecated getElementById() and .hasHtmlElementWithId(),
+ and remove UrlUtils.encodeUrl().
+ </action>
</release>
<release version="2.13" date="Oct 11, 2013" description="Bugfixes">
<action type="update" dev="asashour" issue="1541">
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -115,26 +115,6 @@
private static final String PLATFORM_WIN32 = "Win32";
/**
- * Firefox 3.6.
- * @deprecated as of 2.12. Use FF17 instead.
- **/
- @Deprecated
- public static final BrowserVersion FIREFOX_3_6 = new BrowserVersion(
- NETSCAPE, "5.0 (Windows; en-US)",
- "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28",
- (float) 3.6, "FF3.6", null);
-
- /**
- * Firefox 10. Warning: experimental!!!.
- * @deprecated as of 2.12. Use FF17 instead.
- */
- @Deprecated
- public static final BrowserVersion FIREFOX_10 = new BrowserVersion(
- NETSCAPE, "5.0 (Windows)",
- "Mozilla/5.0 (Windows NT 6.1; rv:10.0.11) Gecko/20100101 Firefox/10.0.11",
- (float) 10.0, "FF10", null);
-
- /**
* Firefox 17 ESR.
* @since 2.12
**/
@@ -143,24 +123,6 @@
"Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0",
(float) 17.0, "FF17", null);
- /**
- * Internet Explorer 6.
- * @deprecated as of 2.12
- */
- @Deprecated
- public static final BrowserVersion INTERNET_EXPLORER_6 = new BrowserVersion(
- INTERNET_EXPLORER, "4.0 (compatible; MSIE 6.0b; Windows 98)",
- "Mozilla/4.0 (compatible; MSIE 6.0; Windows 98)", 6, "IE6", null);
-
- /**
- * Internet Explorer 7.
- * @deprecated as of 2.12
- */
- @Deprecated
- public static final BrowserVersion INTERNET_EXPLORER_7 = new BrowserVersion(
- INTERNET_EXPLORER, "4.0 (compatible; MSIE 7.0; Windows NT 5.1)",
- "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)", 7, "IE7", null);
-
/** Internet Explorer 8. */
public static final BrowserVersion INTERNET_EXPLORER_8 = new BrowserVersion(
INTERNET_EXPLORER, "4.0 (compatible; MSIE 8.0; Windows NT 6.0)",
@@ -176,18 +138,6 @@
INTERNET_EXPLORER, "5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)",
"Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)", 10, "IE10", null);
- /**
- * Chrome 16.
- * @deprecated as of 2.12
- */
- @Deprecated
- public static final BrowserVersion CHROME_16 = new BrowserVersion(
- "Netscape", "5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.7"
- + " (KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.7"
- + " (KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7",
- 16, "Chrome16", null);
-
/** Latest Chrome. Work In Progress!!! */
public static final BrowserVersion CHROME = new BrowserVersion(
"Netscape", "5.0 (Windows NT 6.1) AppleWebKit/537.36"
@@ -201,22 +151,12 @@
/** Register plugins for the browser versions. */
static {
- INTERNET_EXPLORER_6.initDefaultFeatures();
- INTERNET_EXPLORER_7.initDefaultFeatures();
INTERNET_EXPLORER_8.initDefaultFeatures();
INTERNET_EXPLORER_9.initDefaultFeatures();
INTERNET_EXPLORER_10.initDefaultFeatures();
- FIREFOX_3_6.initDefaultFeatures();
- FIREFOX_10.initDefaultFeatures();
FIREFOX_17.initDefaultFeatures();
- FIREFOX_3_6.setHtmlAcceptHeader("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
- FIREFOX_3_6.setImgAcceptHeader("image/png,image/*;q=0.8,*/*;q=0.5");
- FIREFOX_3_6.setCssAcceptHeader("text/css,*/*;q=0.1");
- FIREFOX_10.setHtmlAcceptHeader("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
- FIREFOX_10.setImgAcceptHeader("image/png,image/*;q=0.8,*/*;q=0.5");
- FIREFOX_10.setCssAcceptHeader("text/css,*/*;q=0.1");
FIREFOX_17.setHtmlAcceptHeader("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
FIREFOX_17.setImgAcceptHeader("image/png,image/*;q=0.8,*/*;q=0.5");
FIREFOX_17.setCssAcceptHeader("text/css,*/*;q=0.1");
@@ -227,15 +167,8 @@
"Shockwave Flash 9.0 r31", "libflashplayer.so");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
- FIREFOX_3_6.getPlugins().add(flash);
- FIREFOX_10.getPlugins().add(flash);
FIREFOX_17.getPlugins().add(flash);
- CHROME_16.initDefaultFeatures();
- CHROME_16.setApplicationCodeName("Mozilla");
- CHROME_16.setPlatform("MacIntel");
- CHROME_16.setCpuClass(null);
- CHROME_16.setBrowserLanguage("undefined");
CHROME.initDefaultFeatures();
CHROME.setApplicationCodeName("Mozilla");
CHROME.setPlatform("MacIntel");
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -647,52 +647,6 @@
}
/**
- * Returns the element in this element's page with the specified ID. If more than one element
- * has the specified ID (not allowed by the HTML spec), this method returns the first one.
- *
- * @param id the ID value to search for
- * @param <E> the sub-element type
- * @return the element in this element's page with the specified ID
- * @exception ElementNotFoundException if no element has the specified ID
- * @deprecated as of 2.12, please use {@link HtmlPage#getHtmlElementById(String)}
- */
- @Deprecated
- @SuppressWarnings("unchecked")
- public <E extends HtmlElement> E getElementById(final String id) throws ElementNotFoundException {
- return (E) ((HtmlPage) getPage()).getHtmlElementById(id);
- }
-
- /**
- * <p>Returns <tt>true</tt> if there is an element in this element's page with the specified ID.
- * This method is intended for situations where it is enough to know whether a specific
- * element is present in the document.</p>
- *
- * <p>Implementation Note: This method calls {@link #getElementById(String)} internally,
- * so writing code such as the following would be extremely inefficient:</p>
- *
- * <pre>
- * if (hasHtmlElementWithId(id)) {
- * HtmlElement element = getHtmlElementWithId(id)
- * ...
- * }
- * </pre>
- *
- * @param id the id to search for
- * @return <tt>true</tt> if there is an element in this element's page with the specified ID
- * @deprecated as of 2.12, please use {@link HtmlPage#getElementById(String)}
- */
- @Deprecated
- public boolean hasHtmlElementWithId(final String id) {
- try {
- getElementById(id);
- return true;
- }
- catch (final ElementNotFoundException e) {
- return false;
- }
- }
-
- /**
* Returns all elements which are descendants of this element and match the specified search criteria.
*
* @param elementName the name of the element to search for
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/UrlUtils.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/UrlUtils.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/util/UrlUtils.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -22,7 +22,6 @@
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.net.URLCodec;
-import com.gargoylesoftware.htmlunit.TextUtil;
import com.gargoylesoftware.htmlunit.WebAssert;
/**
@@ -203,22 +202,6 @@
*
* @param url the URL to encode
* @param minimalQueryEncoding whether or not to perform minimal query encoding, like IE does
- * @return the encoded URL
- * @deprecated as of 2.12, please use {@link #encodeUrl(URL, boolean, String)} instead
- */
- @Deprecated
- public static URL encodeUrl(final URL url, final boolean minimalQueryEncoding) {
- return encodeUrl(url, minimalQueryEncoding, TextUtil.DEFAULT_CHARSET);
- }
-
- /**
- * <p>Encodes illegal characters in the specified URL's path, query string and anchor according to the URL
- * encoding rules observed in real browsers.</p>
- *
- * <p>For example, this method changes <tt>"http://first/?a=b c"</tt> to <tt>"http://first/?a=b%20c"</tt>.</p>
- *
- * @param url the URL to encode
- * @param minimalQueryEncoding whether or not to perform minimal query encoding, like IE does
* @param charset the charset
* @return the encoded URL
*/
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -70,21 +70,9 @@
if (BrowserVersionClassRunner.containsTestMethods(klass)) {
final List<String> browsers = WebDriverTestCase.getBrowsersProperties();
- if (browsers.contains("hu") || browsers.contains("hu-ff3.6")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_3_6, false));
- }
- if (/* browsers.contains("hu") ||*/ browsers.contains("hu-ff10")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_10, false));
- }
if (browsers.contains("hu") || browsers.contains("hu-ff17")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_17, false));
}
- if (/*browsers.contains("hu") ||*/ browsers.contains("hu-ie6")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_6, false));
- }
- if (/*browsers.contains("hu") ||*/ browsers.contains("hu-ie7")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_7, false));
- }
if (browsers.contains("hu") || browsers.contains("hu-ie8")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_8, false));
}
@@ -99,21 +87,9 @@
}
if (WebDriverTestCase.class.isAssignableFrom(klass)) {
- if (browsers.contains("ff3.6")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_3_6, true));
- }
- if (browsers.contains("ff10")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_10, true));
- }
if (browsers.contains("ff17")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_17, true));
}
- if (browsers.contains("ie6")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_6, true));
- }
- if (browsers.contains("ie7")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_7, true));
- }
if (browsers.contains("ie8")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_8, true));
}
@@ -181,12 +157,6 @@
/** All versions of Internet Explorer. */
IE,
- /** Internet Explorer 6. */
- IE6,
-
- /** Internet Explorer 7. */
- IE7,
-
/** Internet Explorer 8. */
IE8,
@@ -199,12 +169,6 @@
/** All versions of Firefox. */
FF,
- /** Firefox 3.6. */
- FF3_6,
-
- /** Firefox 10. */
- FF10,
-
/** Firefox 17. */
FF17,
@@ -251,12 +215,6 @@
/** Alerts for any Internet Explorer, it can be overridden by specific IE version. */
String[] IE() default { EMPTY_DEFAULT };
- /** Alerts for Internet Explorer 6. If not defined, {@link #IE()} is used. */
- String[] IE6() default { EMPTY_DEFAULT };
-
- /** Alerts for Internet Explorer 7. If not defined, {@link #IE()} is used. */
- String[] IE7() default { EMPTY_DEFAULT };
-
/** Alerts for Internet Explorer 8. If not defined, {@link #IE()} is used. */
String[] IE8() default { EMPTY_DEFAULT };
@@ -269,12 +227,6 @@
/** Alerts for any Firefox, it can be overridden by specific FF version. */
String[] FF() default { EMPTY_DEFAULT };
- /** Alerts for Firefox 3.6. If not defined, {@link #FF()} is used. */
- String[] FF3_6() default { EMPTY_DEFAULT };
-
- /** Alerts for Firefox 10. If not defined, {@link #FF()} is used. */
- String[] FF10() default { EMPTY_DEFAULT };
-
/** Alerts for Firefox 17. If not defined, {@link #FF()} is used. */
String[] FF17() default { EMPTY_DEFAULT };
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionClassRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionClassRunner.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionClassRunner.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -71,13 +71,7 @@
expectedAlerts = alerts.value();
}
else {
- if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_6) {
- expectedAlerts = firstDefined(alerts.IE6(), alerts.IE(), alerts.DEFAULT());
- }
- else if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_7) {
- expectedAlerts = firstDefined(alerts.IE7(), alerts.IE(), alerts.DEFAULT());
- }
- else if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_8) {
+ if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_8) {
expectedAlerts = firstDefined(alerts.IE8(), alerts.IE(), alerts.DEFAULT());
}
else if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_9) {
@@ -86,12 +80,6 @@
else if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_10) {
expectedAlerts = firstDefined(alerts.IE10(), alerts.IE(), alerts.DEFAULT());
}
- else if (browserVersion_ == BrowserVersion.FIREFOX_3_6) {
- expectedAlerts = firstDefined(alerts.FF3_6(), alerts.FF(), alerts.DEFAULT());
- }
- else if (browserVersion_ == BrowserVersion.FIREFOX_10) {
- expectedAlerts = firstDefined(alerts.FF10(), alerts.FF(), alerts.DEFAULT());
- }
else if (browserVersion_ == BrowserVersion.FIREFOX_17) {
expectedAlerts = firstDefined(alerts.FF17(), alerts.FF(), alerts.DEFAULT());
}
@@ -236,18 +224,6 @@
}
break;
- case IE6:
- if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_6) {
- return true;
- }
- break;
-
- case IE7:
- if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_7) {
- return true;
- }
- break;
-
case IE8:
if (browserVersion_ == BrowserVersion.INTERNET_EXPLORER_8) {
return true;
@@ -272,18 +248,6 @@
}
break;
- case FF3_6:
- if (browserVersion_ == BrowserVersion.FIREFOX_3_6) {
- return true;
- }
- break;
-
- case FF10:
- if (browserVersion_ == BrowserVersion.FIREFOX_10) {
- return true;
- }
- break;
-
case FF17:
if (browserVersion_ == BrowserVersion.FIREFOX_17) {
return true;
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -31,15 +31,10 @@
*/
@Test
public void getBrowserVersionNumeric() {
- assertEquals(3.6f, BrowserVersion.FIREFOX_3_6.getBrowserVersionNumeric());
- assertEquals(10.0f, BrowserVersion.FIREFOX_10.getBrowserVersionNumeric());
assertEquals(17.0f, BrowserVersion.FIREFOX_17.getBrowserVersionNumeric());
- assertEquals(6.0f, BrowserVersion.INTERNET_EXPLORER_6.getBrowserVersionNumeric());
- assertEquals(7.0f, BrowserVersion.INTERNET_EXPLORER_7.getBrowserVersionNumeric());
assertEquals(8.0f, BrowserVersion.INTERNET_EXPLORER_8.getBrowserVersionNumeric());
assertEquals(9.0f, BrowserVersion.INTERNET_EXPLORER_9.getBrowserVersionNumeric());
assertEquals(10.0f, BrowserVersion.INTERNET_EXPLORER_10.getBrowserVersionNumeric());
- assertEquals(16.0f, BrowserVersion.CHROME_16.getBrowserVersionNumeric());
assertEquals(29.0f, BrowserVersion.CHROME.getBrowserVersionNumeric());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -77,20 +77,18 @@
* <pre>
browsers=hu,ff17,ie9
ie.bin=C:\\path\\to\\32bit\\IEDriverServer.exe [Windows]
- ff3.6.bin=c:\\location_to_firefox.exe [Windows]
ff17.bin=/usr/bin/firefox [Unix-like]
chrome.bin=/path/to/chromedriver [Unix-like]
* </pre>
- * The file should contain four properties: "browsers", "ie.bin", "ff3.6.bin", "ff17.bin", and "chrome.bin".
+ * The file should contain four properties: "browsers", "ie.bin", "ff17.bin", and "chrome.bin".
* <ul>
* <li>browsers: is a comma separated list contains any combination of "hu" (for HtmlUnit with all browser versions),
- * "hu-ie6", "hu-ie7", "hu-ie8", "hu-ie9", "hu-ff3.6", "hu-ff17",
- * "ff3.6", "ff17", "ie6", "ie7", "ie8", "ie9", "chrome", which will be used to driver real browsers,
+ * "hu-ie8", "hu-ie9", "hu-ff17",
+ * "ff17", "ie8", "ie9", "chrome", which will be used to driver real browsers,
* note that you can't define more than one IE as there is no standard way
* to have multiple IEs on the same machine</li>
* <li>ie.bin: is the location of the IEDriverServer binary (see
* <a href="http://code.google.com/p/selenium/downloads/list">IEDriverServer downloads</a></li>
- * <li>ff3.6.bin: is the location of the FF3.6 binary, in Windows use double back-slashes</li>
* <li>ff17.bin: is the location of the FF17 binary, in Windows use double back-slashes</li>
* <li>chrome.bin: is the location of the ChromeDriver binary (see
* <a href="http://code.google.com/p/chromedriver/downloads/list">Chrome Driver downloads</a></li>
@@ -109,8 +107,6 @@
private static List<String> BROWSERS_PROPERTIES_;
private static String IE_BIN_;
- private static String FF3_6_BIN_;
- private static String FF10_BIN_;
private static String FF17_BIN_;
private static String CHROME_BIN_;
@@ -148,8 +144,6 @@
= Arrays.asList(properties.getProperty("browsers", "hu")
.replaceAll(" ", "").toLowerCase().split(","));
IE_BIN_ = properties.getProperty("ie.bin");
- FF3_6_BIN_ = properties.getProperty("ff3.6.bin");
- FF10_BIN_ = properties.getProperty("ff10.bin");
FF17_BIN_ = properties.getProperty("ff17.bin");
CHROME_BIN_ = properties.getProperty("chrome.bin");
}
@@ -251,13 +245,7 @@
}
String ffBinary = null;
- if (BrowserVersion.FIREFOX_3_6 == getBrowserVersion()) {
- ffBinary = FF3_6_BIN_;
- }
- else if (BrowserVersion.FIREFOX_10 == getBrowserVersion()) {
- ffBinary = FF10_BIN_;
- }
- else if (BrowserVersion.FIREFOX_17 == getBrowserVersion()) {
+ if (BrowserVersion.FIREFOX_17 == getBrowserVersion()) {
ffBinary = FF17_BIN_;
}
if (ffBinary != null) {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/DomDocumentFragmentTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/DomDocumentFragmentTest.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/DomDocumentFragmentTest.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -37,7 +37,6 @@
*/
@Test
@Alerts(DEFAULT = { "undefined", "undefined" },
- IE6 = { "<div/>", "undefined" },
IE8 = { "<div/>", "undefined" })
public void xml() throws Exception {
final String html = "<html><head><title>foo</title><script>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLElementsTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLElementsTest.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLElementsTest.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -15,7 +15,6 @@
package com.gargoylesoftware.htmlunit.html;
import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.FF;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE6;
import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE8;
import org.junit.Test;
@@ -90,9 +89,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_applet() throws Exception {
loadPageWithAlerts2(elementClosesItself("applet"));
}
@@ -111,9 +109,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_audio() throws Exception {
loadPageWithAlerts2(elementClosesItself("audio"));
}
@@ -187,7 +184,6 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
public void elementClosesItself_body() throws Exception {
loadPageWithAlerts2(elementClosesItself("body"));
@@ -226,9 +222,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_canvas() throws Exception {
loadPageWithAlerts2(elementClosesItself("canvas"));
}
@@ -238,9 +233,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_caption() throws Exception {
loadPageWithAlerts2(elementClosesItself("caption"));
}
@@ -377,7 +371,7 @@
*/
@Test
@Alerts("1")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_form() throws Exception {
loadPageWithAlerts2(elementClosesItself("form"));
}
@@ -387,7 +381,6 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
@NotYetImplemented(FF)
public void elementClosesItself_frame() throws Exception {
@@ -399,7 +392,6 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
@NotYetImplemented
public void elementClosesItself_frameset() throws Exception {
@@ -411,9 +403,8 @@
*/
@Test
@Alerts(DEFAULT = "0",
- IE6 = "1",
IE8 = "1")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_h1() throws Exception {
loadPageWithAlerts2(elementClosesItself("h1"));
}
@@ -423,9 +414,8 @@
*/
@Test
@Alerts(DEFAULT = "0",
- IE6 = "1",
IE8 = "1")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_h2() throws Exception {
loadPageWithAlerts2(elementClosesItself("h2"));
}
@@ -435,9 +425,8 @@
*/
@Test
@Alerts(DEFAULT = "0",
- IE6 = "1",
IE8 = "1")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_h3() throws Exception {
loadPageWithAlerts2(elementClosesItself("h3"));
}
@@ -447,9 +436,8 @@
*/
@Test
@Alerts(DEFAULT = "0",
- IE6 = "1",
IE8 = "1")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_h4() throws Exception {
loadPageWithAlerts2(elementClosesItself("h4"));
}
@@ -459,9 +447,8 @@
*/
@Test
@Alerts(DEFAULT = "0",
- IE6 = "1",
IE8 = "1")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_h5() throws Exception {
loadPageWithAlerts2(elementClosesItself("h5"));
}
@@ -471,9 +458,8 @@
*/
@Test
@Alerts(DEFAULT = "0",
- IE6 = "1",
IE8 = "1")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_h6() throws Exception {
loadPageWithAlerts2(elementClosesItself("h6"));
}
@@ -501,7 +487,6 @@
*/
@Test
@Alerts(DEFAULT = "2",
- IE6 = "null",
IE8 = "null")
@NotYetImplemented(FF)
public void elementClosesItself_html() throws Exception {
@@ -513,9 +498,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_iframe() throws Exception {
loadPageWithAlerts2(elementClosesItself("iframe"));
}
@@ -589,9 +573,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_legend() throws Exception {
loadPageWithAlerts2(elementClosesItself("legend"));
}
@@ -673,9 +656,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_multicol() throws Exception {
loadPageWithAlerts2(elementClosesItself("multicol"));
}
@@ -695,9 +677,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_noembed() throws Exception {
loadPageWithAlerts2(elementClosesItself("noembed"));
}
@@ -707,9 +688,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_noframes() throws Exception {
loadPageWithAlerts2(elementClosesItself("noframes"));
}
@@ -719,7 +699,6 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
public void elementClosesItself_noscript() throws Exception {
loadPageWithAlerts2(elementClosesItself("noscript"));
@@ -730,9 +709,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_object() throws Exception {
loadPageWithAlerts2(elementClosesItself("object"));
}
@@ -751,7 +729,6 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
@NotYetImplemented
public void elementClosesItself_optgroup() throws Exception {
@@ -809,9 +786,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_progress() throws Exception {
loadPageWithAlerts2(elementClosesItself("progress"));
}
@@ -839,7 +815,6 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
@NotYetImplemented
public void elementClosesItself_script() throws Exception {
@@ -879,7 +854,6 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
@NotYetImplemented(FF)
public void elementClosesItself_spacer() throws Exception {
@@ -918,9 +892,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_style() throws Exception {
loadPageWithAlerts2(elementClosesItself("style"));
}
@@ -948,7 +921,6 @@
*/
@Test
@Alerts(DEFAULT = "0",
- IE6 = "1",
IE8 = "1")
@NotYetImplemented(FF)
public void elementClosesItself_table() throws Exception {
@@ -960,9 +932,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_col() throws Exception {
loadPageWithAlerts2(elementClosesItself("col"));
}
@@ -972,9 +943,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_colgroup() throws Exception {
loadPageWithAlerts2(elementClosesItself("colgroup"));
}
@@ -984,9 +954,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_tbody() throws Exception {
loadPageWithAlerts2(elementClosesItself("tbody"));
}
@@ -996,9 +965,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_td() throws Exception {
loadPageWithAlerts2(elementClosesItself("td"));
}
@@ -1008,9 +976,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_th() throws Exception {
loadPageWithAlerts2(elementClosesItself("th"));
}
@@ -1020,9 +987,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_tr() throws Exception {
loadPageWithAlerts2(elementClosesItself("tr"));
}
@@ -1041,9 +1007,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_tfoot() throws Exception {
loadPageWithAlerts2(elementClosesItself("tfoot"));
}
@@ -1053,9 +1018,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_thead() throws Exception {
loadPageWithAlerts2(elementClosesItself("thead"));
}
@@ -1074,7 +1038,6 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
@NotYetImplemented(FF)
public void elementClosesItself_title() throws Exception {
@@ -1113,9 +1076,8 @@
*/
@Test
@Alerts(DEFAULT = "1",
- IE6 = "0",
IE8 = "0")
- @NotYetImplemented({ IE6, IE8 })
+ @NotYetImplemented(IE8)
public void elementClosesItself_video() throws Exception {
loadPageWithAlerts2(elementClosesItself("video"));
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java 2013-10-11 04:18:19 UTC (rev 8648)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java 2013-10-11 06:24:05 UTC (rev 8649)
@@ -15,9 +15,7 @@
package com.gargoylesoftware.htmlunit.html;
import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.FF;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.FF3_6;
import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.FF17;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE6;
import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.IE8;
import org.junit.Test;
@@ -59,8 +5...
[truncated message content] |
