diff --git a/tests/test_Ajax.html b/tests/Ajax.html similarity index 100% rename from tests/test_Ajax.html rename to tests/Ajax.html diff --git a/tests/test_BaseTypes.html b/tests/BaseTypes.html similarity index 100% rename from tests/test_BaseTypes.html rename to tests/BaseTypes.html diff --git a/tests/BaseTypes/test_Bounds.html b/tests/BaseTypes/Bounds.html similarity index 100% rename from tests/BaseTypes/test_Bounds.html rename to tests/BaseTypes/Bounds.html diff --git a/tests/BaseTypes/test_Class.html b/tests/BaseTypes/Class.html similarity index 100% rename from tests/BaseTypes/test_Class.html rename to tests/BaseTypes/Class.html diff --git a/tests/BaseTypes/test_Element.html b/tests/BaseTypes/Element.html similarity index 100% rename from tests/BaseTypes/test_Element.html rename to tests/BaseTypes/Element.html diff --git a/tests/BaseTypes/test_LonLat.html b/tests/BaseTypes/LonLat.html similarity index 100% rename from tests/BaseTypes/test_LonLat.html rename to tests/BaseTypes/LonLat.html diff --git a/tests/BaseTypes/test_Pixel.html b/tests/BaseTypes/Pixel.html similarity index 100% rename from tests/BaseTypes/test_Pixel.html rename to tests/BaseTypes/Pixel.html diff --git a/tests/BaseTypes/test_Size.html b/tests/BaseTypes/Size.html similarity index 100% rename from tests/BaseTypes/test_Size.html rename to tests/BaseTypes/Size.html diff --git a/tests/test_Console.html b/tests/Console.html similarity index 100% rename from tests/test_Console.html rename to tests/Console.html diff --git a/tests/test_Control.html b/tests/Control.html similarity index 100% rename from tests/test_Control.html rename to tests/Control.html diff --git a/tests/Control/test_Attribution.html b/tests/Control/Attribution.html similarity index 100% rename from tests/Control/test_Attribution.html rename to tests/Control/Attribution.html diff --git a/tests/Control/test_Button.html b/tests/Control/Button.html similarity index 100% rename from tests/Control/test_Button.html rename to tests/Control/Button.html diff --git a/tests/Control/test_DragFeature.html b/tests/Control/DragFeature.html similarity index 100% rename from tests/Control/test_DragFeature.html rename to tests/Control/DragFeature.html diff --git a/tests/Control/test_DragPan.html b/tests/Control/DragPan.html similarity index 100% rename from tests/Control/test_DragPan.html rename to tests/Control/DragPan.html diff --git a/tests/Control/test_KeyboardDefaults.html b/tests/Control/KeyboardDefaults.html similarity index 100% rename from tests/Control/test_KeyboardDefaults.html rename to tests/Control/KeyboardDefaults.html diff --git a/tests/Control/test_LayerSwitcher.html b/tests/Control/LayerSwitcher.html similarity index 100% rename from tests/Control/test_LayerSwitcher.html rename to tests/Control/LayerSwitcher.html diff --git a/tests/Control/test_ModifyFeature.html b/tests/Control/ModifyFeature.html similarity index 100% rename from tests/Control/test_ModifyFeature.html rename to tests/Control/ModifyFeature.html diff --git a/tests/Control/test_MousePosition.html b/tests/Control/MousePosition.html similarity index 100% rename from tests/Control/test_MousePosition.html rename to tests/Control/MousePosition.html diff --git a/tests/Control/test_MouseToolbar.html b/tests/Control/MouseToolbar.html similarity index 100% rename from tests/Control/test_MouseToolbar.html rename to tests/Control/MouseToolbar.html diff --git a/tests/Control/test_NavToolbar.html b/tests/Control/NavToolbar.html similarity index 100% rename from tests/Control/test_NavToolbar.html rename to tests/Control/NavToolbar.html diff --git a/tests/Control/test_Navigation.html b/tests/Control/Navigation.html similarity index 100% rename from tests/Control/test_Navigation.html rename to tests/Control/Navigation.html diff --git a/tests/Control/test_NavigationHistory.html b/tests/Control/NavigationHistory.html similarity index 100% rename from tests/Control/test_NavigationHistory.html rename to tests/Control/NavigationHistory.html diff --git a/tests/Control/test_OverviewMap.html b/tests/Control/OverviewMap.html similarity index 100% rename from tests/Control/test_OverviewMap.html rename to tests/Control/OverviewMap.html diff --git a/tests/Control/test_PanZoom.html b/tests/Control/PanZoom.html similarity index 100% rename from tests/Control/test_PanZoom.html rename to tests/Control/PanZoom.html diff --git a/tests/Control/test_PanZoomBar.html b/tests/Control/PanZoomBar.html similarity index 100% rename from tests/Control/test_PanZoomBar.html rename to tests/Control/PanZoomBar.html diff --git a/tests/Control/test_Panel.html b/tests/Control/Panel.html similarity index 100% rename from tests/Control/test_Panel.html rename to tests/Control/Panel.html diff --git a/tests/Control/test_Permalink.html b/tests/Control/Permalink.html similarity index 100% rename from tests/Control/test_Permalink.html rename to tests/Control/Permalink.html diff --git a/tests/Control/test_Scale.html b/tests/Control/Scale.html similarity index 100% rename from tests/Control/test_Scale.html rename to tests/Control/Scale.html diff --git a/tests/Control/test_ScaleLine.html b/tests/Control/ScaleLine.html similarity index 100% rename from tests/Control/test_ScaleLine.html rename to tests/Control/ScaleLine.html diff --git a/tests/Control/test_SelectFeature.html b/tests/Control/SelectFeature.html similarity index 100% rename from tests/Control/test_SelectFeature.html rename to tests/Control/SelectFeature.html diff --git a/tests/test_Events.html b/tests/Events.html similarity index 100% rename from tests/test_Events.html rename to tests/Events.html diff --git a/tests/test_Feature.html b/tests/Feature.html similarity index 100% rename from tests/test_Feature.html rename to tests/Feature.html diff --git a/tests/Feature/test_Vector.html b/tests/Feature/Vector.html similarity index 100% rename from tests/Feature/test_Vector.html rename to tests/Feature/Vector.html diff --git a/tests/test_Format.html b/tests/Format.html similarity index 100% rename from tests/test_Format.html rename to tests/Format.html diff --git a/tests/Format/test_GML.html b/tests/Format/GML.html similarity index 100% rename from tests/Format/test_GML.html rename to tests/Format/GML.html diff --git a/tests/Format/test_GeoJSON.html b/tests/Format/GeoJSON.html similarity index 100% rename from tests/Format/test_GeoJSON.html rename to tests/Format/GeoJSON.html diff --git a/tests/Format/test_GeoRSS.html b/tests/Format/GeoRSS.html similarity index 100% rename from tests/Format/test_GeoRSS.html rename to tests/Format/GeoRSS.html diff --git a/tests/Format/test_JSON.html b/tests/Format/JSON.html similarity index 100% rename from tests/Format/test_JSON.html rename to tests/Format/JSON.html diff --git a/tests/Format/test_KML.html b/tests/Format/KML.html similarity index 100% rename from tests/Format/test_KML.html rename to tests/Format/KML.html diff --git a/tests/Format/test_OSM.html b/tests/Format/OSM.html similarity index 100% rename from tests/Format/test_OSM.html rename to tests/Format/OSM.html diff --git a/tests/Format/test_SLD.html b/tests/Format/SLD.html similarity index 100% rename from tests/Format/test_SLD.html rename to tests/Format/SLD.html diff --git a/tests/Format/test_WKT.html b/tests/Format/WKT.html similarity index 100% rename from tests/Format/test_WKT.html rename to tests/Format/WKT.html diff --git a/tests/Format/test_WMC.html b/tests/Format/WMC.html similarity index 100% rename from tests/Format/test_WMC.html rename to tests/Format/WMC.html diff --git a/tests/Format/test_XML.html b/tests/Format/XML.html similarity index 100% rename from tests/Format/test_XML.html rename to tests/Format/XML.html diff --git a/tests/test_Geometry.html b/tests/Geometry.html similarity index 100% rename from tests/test_Geometry.html rename to tests/Geometry.html diff --git a/tests/Geometry/test_Collection.html b/tests/Geometry/Collection.html similarity index 100% rename from tests/Geometry/test_Collection.html rename to tests/Geometry/Collection.html diff --git a/tests/Geometry/test_Curve.html b/tests/Geometry/Curve.html similarity index 100% rename from tests/Geometry/test_Curve.html rename to tests/Geometry/Curve.html diff --git a/tests/Geometry/test_LineString.html b/tests/Geometry/LineString.html similarity index 100% rename from tests/Geometry/test_LineString.html rename to tests/Geometry/LineString.html diff --git a/tests/Geometry/test_LinearRing.html b/tests/Geometry/LinearRing.html similarity index 100% rename from tests/Geometry/test_LinearRing.html rename to tests/Geometry/LinearRing.html diff --git a/tests/Geometry/test_MultiLineString.html b/tests/Geometry/MultiLineString.html similarity index 100% rename from tests/Geometry/test_MultiLineString.html rename to tests/Geometry/MultiLineString.html diff --git a/tests/Geometry/test_MultiPoint.html b/tests/Geometry/MultiPoint.html similarity index 100% rename from tests/Geometry/test_MultiPoint.html rename to tests/Geometry/MultiPoint.html diff --git a/tests/Geometry/test_MultiPolygon.html b/tests/Geometry/MultiPolygon.html similarity index 100% rename from tests/Geometry/test_MultiPolygon.html rename to tests/Geometry/MultiPolygon.html diff --git a/tests/Geometry/test_Point.html b/tests/Geometry/Point.html similarity index 100% rename from tests/Geometry/test_Point.html rename to tests/Geometry/Point.html diff --git a/tests/Geometry/test_Polygon.html b/tests/Geometry/Polygon.html similarity index 100% rename from tests/Geometry/test_Polygon.html rename to tests/Geometry/Polygon.html diff --git a/tests/Geometry/test_Rectangle.html b/tests/Geometry/Rectangle.html similarity index 100% rename from tests/Geometry/test_Rectangle.html rename to tests/Geometry/Rectangle.html diff --git a/tests/Geometry/test_Surface.html b/tests/Geometry/Surface.html similarity index 100% rename from tests/Geometry/test_Surface.html rename to tests/Geometry/Surface.html diff --git a/tests/test_Handler.html b/tests/Handler.html similarity index 100% rename from tests/test_Handler.html rename to tests/Handler.html diff --git a/tests/Handler/test_Click.html b/tests/Handler/Click.html similarity index 100% rename from tests/Handler/test_Click.html rename to tests/Handler/Click.html diff --git a/tests/Handler/test_Drag.html b/tests/Handler/Drag.html similarity index 100% rename from tests/Handler/test_Drag.html rename to tests/Handler/Drag.html diff --git a/tests/Handler/test_Feature.html b/tests/Handler/Feature.html similarity index 100% rename from tests/Handler/test_Feature.html rename to tests/Handler/Feature.html diff --git a/tests/Handler/test_Hover.html b/tests/Handler/Hover.html similarity index 100% rename from tests/Handler/test_Hover.html rename to tests/Handler/Hover.html diff --git a/tests/Handler/test_Keyboard.html b/tests/Handler/Keyboard.html similarity index 100% rename from tests/Handler/test_Keyboard.html rename to tests/Handler/Keyboard.html diff --git a/tests/Handler/test_MouseWheel.html b/tests/Handler/MouseWheel.html similarity index 100% rename from tests/Handler/test_MouseWheel.html rename to tests/Handler/MouseWheel.html diff --git a/tests/Handler/test_Path.html b/tests/Handler/Path.html similarity index 100% rename from tests/Handler/test_Path.html rename to tests/Handler/Path.html diff --git a/tests/Handler/test_Point.html b/tests/Handler/Point.html similarity index 100% rename from tests/Handler/test_Point.html rename to tests/Handler/Point.html diff --git a/tests/Handler/test_Polygon.html b/tests/Handler/Polygon.html similarity index 100% rename from tests/Handler/test_Polygon.html rename to tests/Handler/Polygon.html diff --git a/tests/Handler/test_RegularPolygon.html b/tests/Handler/RegularPolygon.html similarity index 100% rename from tests/Handler/test_RegularPolygon.html rename to tests/Handler/RegularPolygon.html diff --git a/tests/test_Icon.html b/tests/Icon.html similarity index 100% rename from tests/test_Icon.html rename to tests/Icon.html diff --git a/tests/test_Lang.html b/tests/Lang.html similarity index 100% rename from tests/test_Lang.html rename to tests/Lang.html diff --git a/tests/test_Layer.html b/tests/Layer.html similarity index 100% rename from tests/test_Layer.html rename to tests/Layer.html diff --git a/tests/Layer/test_EventPane.html b/tests/Layer/EventPane.html similarity index 100% rename from tests/Layer/test_EventPane.html rename to tests/Layer/EventPane.html diff --git a/tests/Layer/test_FixedZoomLevels.html b/tests/Layer/FixedZoomLevels.html similarity index 100% rename from tests/Layer/test_FixedZoomLevels.html rename to tests/Layer/FixedZoomLevels.html diff --git a/tests/Layer/test_GML.html b/tests/Layer/GML.html similarity index 74% rename from tests/Layer/test_GML.html rename to tests/Layer/GML.html index 09b83a7f91..16fb9eb15e 100644 --- a/tests/Layer/test_GML.html +++ b/tests/Layer/GML.html @@ -5,20 +5,15 @@ var name = "GML Layer"; - // The actual path these files are read from differs: - // some browsers treat relative paths from within an iframe - // as relative to the parent, some treat them as relative to the child - // At this time: - // * IE6 + IE7 - // * Firefox 2.0.0.13+ - // read them from relative to the iframe contents, rather than parent, - // so these files are in *two* places: one in the "Layer/" subdirectory, - // and one in the root. This majorly sucks, but it's a way to keep it - // working without hardcoding a version number into the tests. var gml = "./owls.xml"; var gml2 = "./mice.xml"; + // if this test is running online, different rules apply var isMSIE = (navigator.userAgent.indexOf("MSIE") > -1); + if (isMSIE) { + gml = "." + gml; + gml2 = "." + gml2; + } function test_01_Layer_GML_constructor(t) { t.plan(3); diff --git a/tests/Layer/test_GeoRSS.html b/tests/Layer/GeoRSS.html similarity index 91% rename from tests/Layer/test_GeoRSS.html rename to tests/Layer/GeoRSS.html index 30277eb159..8d5ecbf6cf 100644 --- a/tests/Layer/test_GeoRSS.html +++ b/tests/Layer/GeoRSS.html @@ -8,17 +8,12 @@ var georss_txt = "./georss.txt"; var atom_xml = "./atom-1.0.xml"; - - // The actual path these files are read from differs: - // some browsers treat relative paths from within an iframe - // as relative to the parent, some treat them as relative to the child - // At this time: - // * IE6 + IE7 - // * Firefox 2.0.0.13+ - // read them from relative to the iframe contents, rather than parent, - // so these files are in *two* places: one in the "Layer/" subdirectory, - // and one in the root. This majorly sucks, but it's a way to keep it - // working without hardcoding a version number into the tests. + + // if this test is running online, different rules apply + if (isMSIE) { + georss_txt = "." + georss_txt; + atom_xml = "." + atom_xml; + } function test_01_Layer_GeoRSS_constructor (t) { t.plan( 5 ); @@ -97,7 +92,7 @@ }); } function test_Layer_GeoRSS_popups (t) { - t.plan( 4 ); + t.plan( 8 ); layer = new OpenLayers.Layer.GeoRSS('Test Layer', georss_txt); var map = new OpenLayers.Map('map'); var baseLayer = new OpenLayers.Layer.WMS("Test Layer", @@ -112,14 +107,18 @@ t.eq(layer.markers[0].events.listeners['click'].length, 1, "Marker events has one object"); layer.markers[0].events.triggerEvent('click', event); t.eq(map.popups.length, 1, "Popup opened correctly"); + t.eq(map.popups[0].size.w, 250, "Popup sized correctly x"); + t.eq(map.popups[0].size.h, 120, "Popup sized correctly y"); layer.markers[1].events.triggerEvent('click', event); t.eq(map.popups.length, 1, "1st popup gone, 2nd Popup opened correctly"); + t.eq(map.popups[0].size.w, 250, "Popup sized correctly x"); + t.eq(map.popups[0].size.h, 120, "Popup sized correctly y"); }); } function test_Layer_GeoRSS_resizedPopups(t) { layer = new OpenLayers.Layer.GeoRSS('Test Layer', georss_txt, {'popupSize': new OpenLayers.Size(200,100)}); - t.plan( 4 ); + t.plan( 8 ); var map = new OpenLayers.Map('map'); var baseLayer = new OpenLayers.Layer.WMS("Test Layer", "http://octo.metacarta.com/cgi-bin/mapserv?", @@ -133,9 +132,13 @@ t.eq(layer.markers[0].events.listeners['click'].length, 1, "Marker events has one object"); layer.markers[0].events.triggerEvent('click', event); t.eq(map.popups.length, 1, "Popup opened correctly"); + t.eq(map.popups[0].size.w, 200, "Popup sized correctly x"); + t.eq(map.popups[0].size.h, 100, "Popup sized correctly y"); map.popups[0].size.w=300; layer.markers[1].events.triggerEvent('click', event); t.eq(map.popups.length, 1, "1st popup gone, 2nd Popup opened correctly"); + t.eq(map.popups[0].size.w, 200, "Popup sized correctly x"); + t.eq(map.popups[0].size.h, 100, "Popup sized correctly y"); }); } diff --git a/tests/Layer/test_Google.html b/tests/Layer/Google.html similarity index 100% rename from tests/Layer/test_Google.html rename to tests/Layer/Google.html diff --git a/tests/Layer/test_Grid.html b/tests/Layer/Grid.html similarity index 100% rename from tests/Layer/test_Grid.html rename to tests/Layer/Grid.html diff --git a/tests/Layer/test_HTTPRequest.html b/tests/Layer/HTTPRequest.html similarity index 100% rename from tests/Layer/test_HTTPRequest.html rename to tests/Layer/HTTPRequest.html diff --git a/tests/Layer/test_Image.html b/tests/Layer/Image.html similarity index 100% rename from tests/Layer/test_Image.html rename to tests/Layer/Image.html diff --git a/tests/Layer/test_KaMap.html b/tests/Layer/KaMap.html similarity index 100% rename from tests/Layer/test_KaMap.html rename to tests/Layer/KaMap.html diff --git a/tests/Layer/test_MapGuide.html b/tests/Layer/MapGuide.html similarity index 100% rename from tests/Layer/test_MapGuide.html rename to tests/Layer/MapGuide.html diff --git a/tests/Layer/test_MapServer.html b/tests/Layer/MapServer.html similarity index 100% rename from tests/Layer/test_MapServer.html rename to tests/Layer/MapServer.html diff --git a/tests/Layer/test_Markers.html b/tests/Layer/Markers.html similarity index 100% rename from tests/Layer/test_Markers.html rename to tests/Layer/Markers.html diff --git a/tests/Layer/test_MultiMap.html b/tests/Layer/MultiMap.html similarity index 100% rename from tests/Layer/test_MultiMap.html rename to tests/Layer/MultiMap.html diff --git a/tests/Layer/test_PointTrack.html b/tests/Layer/PointTrack.html similarity index 100% rename from tests/Layer/test_PointTrack.html rename to tests/Layer/PointTrack.html diff --git a/tests/Layer/test_SphericalMercator.html b/tests/Layer/SphericalMercator.html similarity index 100% rename from tests/Layer/test_SphericalMercator.html rename to tests/Layer/SphericalMercator.html diff --git a/tests/Layer/test_TMS.html b/tests/Layer/TMS.html similarity index 100% rename from tests/Layer/test_TMS.html rename to tests/Layer/TMS.html diff --git a/tests/Layer/test_Text.html b/tests/Layer/Text.html similarity index 92% rename from tests/Layer/test_Text.html rename to tests/Layer/Text.html index ef9993ba08..dcbe679f0f 100644 --- a/tests/Layer/test_Text.html +++ b/tests/Layer/Text.html @@ -6,20 +6,17 @@ var isMSIE = (navigator.userAgent.indexOf("MSIE") > -1); var layer; - // The actual path these files are read from differs: - // some browsers treat relative paths from within an iframe - // as relative to the parent, some treat them as relative to the child - // At this time: - // * IE6 + IE7 - // * Firefox 2.0.0.13+ - // read them from relative to the iframe contents, rather than parent, - // so these files are in *two* places: one in the "Layer/" subdirectory, - // and one in the root. This majorly sucks, but it's a way to keep it - // working without hardcoding a version number into the tests. var datafile = "./data_Layer_Text_textfile.txt"; var datafile2 = "./data_Layer_Text_textfile_2.txt"; var datafile_overflow = "./data_Layer_Text_textfile_overflow.txt"; + // if this test is running in IE, different rules apply + if (isMSIE) { + datafile = "." + datafile; + datafile2 = "." + datafile2; + datafile_overflow = "." + datafile_overflow; + } + function test_01_Layer_Text_constructor (t) { t.plan( 5 ); diff --git a/tests/Layer/test_TileCache.html b/tests/Layer/TileCache.html similarity index 100% rename from tests/Layer/test_TileCache.html rename to tests/Layer/TileCache.html diff --git a/tests/Layer/test_Vector.html b/tests/Layer/Vector.html similarity index 100% rename from tests/Layer/test_Vector.html rename to tests/Layer/Vector.html diff --git a/tests/Layer/test_WFS.html b/tests/Layer/WFS.html similarity index 100% rename from tests/Layer/test_WFS.html rename to tests/Layer/WFS.html diff --git a/tests/Layer/test_WMS.html b/tests/Layer/WMS.html similarity index 100% rename from tests/Layer/test_WMS.html rename to tests/Layer/WMS.html diff --git a/tests/Layer/test_WrapDateLine.html b/tests/Layer/WrapDateLine.html similarity index 100% rename from tests/Layer/test_WrapDateLine.html rename to tests/Layer/WrapDateLine.html diff --git a/tests/Layer/test_Yahoo.html b/tests/Layer/Yahoo.html similarity index 100% rename from tests/Layer/test_Yahoo.html rename to tests/Layer/Yahoo.html diff --git a/tests/test_Map.html b/tests/Map.html similarity index 100% rename from tests/test_Map.html rename to tests/Map.html diff --git a/tests/test_Marker.html b/tests/Marker.html similarity index 100% rename from tests/test_Marker.html rename to tests/Marker.html diff --git a/tests/Marker/test_Box.html b/tests/Marker/Box.html similarity index 100% rename from tests/Marker/test_Box.html rename to tests/Marker/Box.html diff --git a/tests/test_OpenLayers.html b/tests/OpenLayers.html similarity index 100% rename from tests/test_OpenLayers.html rename to tests/OpenLayers.html diff --git a/tests/test_Popup.html b/tests/Popup.html similarity index 92% rename from tests/test_Popup.html rename to tests/Popup.html index cf00241f7e..d3bc0cf6b5 100644 --- a/tests/test_Popup.html +++ b/tests/Popup.html @@ -84,10 +84,9 @@ popup.lonlat = true; popup.updatePosition(); t.ok(true, "update position doesn't fail when getLayerPxFromLonLat fails."); - map.destroy(); } function test_03_Popup_draw(t) { - t.plan( 13 ); + t.plan( 17 ); var id = "chicken"; var x = 50; @@ -99,28 +98,31 @@ var hexColor = "#ff0000"; var opacity = 0.5; var border = "1px solid"; - map1 = new OpenLayers.Map("map"); + popup = new OpenLayers.Popup(id); popup.setSize(new OpenLayers.Size(w, h)); popup.setContentHTML(content); popup.setBackgroundColor(color); popup.setOpacity(opacity); popup.setBorder(border); - map1.addPopup(popup); - popup.moveTo(new OpenLayers.Pixel(x, y)); + popup.draw(new OpenLayers.Pixel(x, y)); t.eq(popup.div.id, id, "popup.div.id set correctly"); t.eq(popup.div.style.left, x + "px", "left position of popup.div set correctly"); t.eq(popup.div.style.top, y + "px", "top position of popup.div set correctly"); + t.eq(popup.div.style.width, w + "px", "width position of popup.div set correctly"); + t.eq(popup.div.style.height, h + "px", "heightposition of popup.div set correctly"); var contentDiv = popup.div.childNodes[0].childNodes[0]; t.eq(contentDiv.className, "olPopupContent", "correct content div className"); t.eq(contentDiv.id, "chicken_contentDiv", "correct content div id"); + t.eq(contentDiv.style.width, "500px", "correct content div width"); + t.eq(contentDiv.style.height, "400px", "correct content div height"); t.eq(contentDiv.style.position, "relative", "correct content div position"); //Safari 3 separates style overflow into overflow-x and overflow-y var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; - t.eq(contentDiv.style[prop], "", "correct content div overflow"); + t.eq(contentDiv.style[prop], "hidden", "correct content div overflow"); t.eq(contentDiv.innerHTML, content, "correct content div content"); var bColor = popup.div.style.backgroundColor; diff --git a/tests/Popup/test_Anchored.html b/tests/Popup/Anchored.html similarity index 100% rename from tests/Popup/test_Anchored.html rename to tests/Popup/Anchored.html diff --git a/tests/Popup/test_AnchoredBubble.html b/tests/Popup/AnchoredBubble.html similarity index 100% rename from tests/Popup/test_AnchoredBubble.html rename to tests/Popup/AnchoredBubble.html diff --git a/tests/test_Projection.html b/tests/Projection.html similarity index 100% rename from tests/test_Projection.html rename to tests/Projection.html diff --git a/tests/test_Renderer.html b/tests/Renderer.html similarity index 100% rename from tests/test_Renderer.html rename to tests/Renderer.html diff --git a/tests/Renderer/test_Elements.html b/tests/Renderer/Elements.html similarity index 100% rename from tests/Renderer/test_Elements.html rename to tests/Renderer/Elements.html diff --git a/tests/Renderer/test_SVG.html b/tests/Renderer/SVG.html similarity index 100% rename from tests/Renderer/test_SVG.html rename to tests/Renderer/SVG.html diff --git a/tests/Renderer/test_VML.html b/tests/Renderer/VML.html similarity index 100% rename from tests/Renderer/test_VML.html rename to tests/Renderer/VML.html diff --git a/tests/test_Rule.html b/tests/Rule.html similarity index 100% rename from tests/test_Rule.html rename to tests/Rule.html diff --git a/tests/Rule/test_Comparison.html b/tests/Rule/Comparison.html similarity index 100% rename from tests/Rule/test_Comparison.html rename to tests/Rule/Comparison.html diff --git a/tests/Rule/test_FeatureId.html b/tests/Rule/FeatureId.html similarity index 100% rename from tests/Rule/test_FeatureId.html rename to tests/Rule/FeatureId.html diff --git a/tests/Rule/test_Logical.html b/tests/Rule/Logical.html similarity index 100% rename from tests/Rule/test_Logical.html rename to tests/Rule/Logical.html diff --git a/tests/test_Style.html b/tests/Style.html similarity index 100% rename from tests/test_Style.html rename to tests/Style.html diff --git a/tests/test_StyleMap.html b/tests/StyleMap.html similarity index 100% rename from tests/test_StyleMap.html rename to tests/StyleMap.html diff --git a/tests/test_Tile.html b/tests/Tile.html similarity index 100% rename from tests/test_Tile.html rename to tests/Tile.html diff --git a/tests/Tile/test_Image.html b/tests/Tile/Image.html similarity index 100% rename from tests/Tile/test_Image.html rename to tests/Tile/Image.html diff --git a/tests/Tile/test_WFS.html b/tests/Tile/WFS.html similarity index 100% rename from tests/Tile/test_WFS.html rename to tests/Tile/WFS.html diff --git a/tests/test_Tween.html b/tests/Tween.html similarity index 100% rename from tests/test_Tween.html rename to tests/Tween.html diff --git a/tests/test_Util.html b/tests/Util.html similarity index 100% rename from tests/test_Util.html rename to tests/Util.html