Reformatting of testfile prior to fixing failing test in Firefox 10.0.1.
No functional change.
This commit is contained in:
@@ -3,19 +3,23 @@
|
|||||||
<script src="../OLLoader.js"></script>
|
<script src="../OLLoader.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var map, control;
|
var map, control;
|
||||||
|
|
||||||
function test_initialize(t) {
|
function test_initialize(t) {
|
||||||
t.plan( 2 );
|
t.plan( 2 );
|
||||||
|
|
||||||
control = new OpenLayers.Control.OverviewMap();
|
control = new OpenLayers.Control.OverviewMap();
|
||||||
t.ok( control instanceof OpenLayers.Control.OverviewMap, "new OpenLayers.Control.OverviewMap returns object" );
|
t.ok( control instanceof OpenLayers.Control.OverviewMap,
|
||||||
t.eq( control.displayClass, "olControlOverviewMap", "displayClass is correct" );
|
"new OpenLayers.Control.OverviewMap returns object" );
|
||||||
|
t.eq( control.displayClass,
|
||||||
|
"olControlOverviewMap", "displayClass is correct" );
|
||||||
}
|
}
|
||||||
|
|
||||||
function test_setMap(t) {
|
function test_setMap(t) {
|
||||||
t.plan(4);
|
t.plan(4);
|
||||||
|
|
||||||
var setMapTest = function(map) {
|
var setMapTest = function(map) {
|
||||||
t.ok(true, "Handler.setMap called for " + this.CLASS_NAME);
|
t.ok(true,
|
||||||
|
"Handler.setMap called for " + this.CLASS_NAME);
|
||||||
this.map = map;
|
this.map = map;
|
||||||
};
|
};
|
||||||
var drag_setMap = OpenLayers.Handler.Drag.prototype.setMap;
|
var drag_setMap = OpenLayers.Handler.Drag.prototype.setMap;
|
||||||
@@ -32,8 +36,10 @@
|
|||||||
map.addControl(control);
|
map.addControl(control);
|
||||||
|
|
||||||
map.zoomToMaxExtent();
|
map.zoomToMaxExtent();
|
||||||
t.eq(control.handlers.drag.map.id, control.ovmap.id, "drag.map is correct");
|
t.eq(control.handlers.drag.map.id, control.ovmap.id,
|
||||||
t.eq(control.handlers.click.map.id, control.ovmap.id, "click.map is correct");
|
"drag.map is correct");
|
||||||
|
t.eq(control.handlers.click.map.id, control.ovmap.id,
|
||||||
|
"click.map is correct");
|
||||||
|
|
||||||
map.destroy();
|
map.destroy();
|
||||||
OpenLayers.Handler.Drag.prototype.setMap = drag_setMap;
|
OpenLayers.Handler.Drag.prototype.setMap = drag_setMap;
|
||||||
@@ -66,39 +72,47 @@
|
|||||||
|
|
||||||
control.destroy();
|
control.destroy();
|
||||||
t.eq(log_drag.length, 2,
|
t.eq(log_drag.length, 2,
|
||||||
"destroy() destroys drag handler twice, expected");
|
"destroy() destroys drag handler twice, expected");
|
||||||
if (log_drag.length == 2) {
|
if (log_drag.length == 2) {
|
||||||
t.eq(log_drag[0].map, true,
|
t.eq(log_drag[0].map, true,
|
||||||
"destroy() destroys drag handler before ovmap is destroyed (0)");
|
"destroy() destroys drag handler before ovmap is destroyed (0)");
|
||||||
t.eq(log_drag[1].map, false,
|
t.eq(log_drag[1].map, false,
|
||||||
"destroy() destroys drag handler after ovmap is destroyed (1)");
|
"destroy() destroys drag handler after ovmap is destroyed (1)");
|
||||||
}
|
}
|
||||||
t.eq(log_click.length, 2,
|
t.eq(log_click.length, 2,
|
||||||
"destroy() destroys click handler twice, expected");
|
"destroy() destroys click handler twice, expected");
|
||||||
if (log_click.length == 2) {
|
if (log_click.length == 2) {
|
||||||
t.eq(log_click[0].map, true,
|
t.eq(log_click[0].map, true,
|
||||||
"destroy() destroys click handler before ovmap is destroyed (0)");
|
"destroy() destroys click handler before ovmap is destroyed (0)");
|
||||||
t.eq(log_click[1].map, false,
|
t.eq(log_click[1].map, false,
|
||||||
"destroy() destroys click handler after ovmap is destroyed (1)");
|
"destroy() destroys click handler after ovmap is destroyed (1)");
|
||||||
}
|
}
|
||||||
|
|
||||||
// tear down
|
// tear down
|
||||||
map.destroy();
|
map.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
function test_addControl (t) {
|
function test_addControl (t) {
|
||||||
t.plan( 6 );
|
t.plan( 6 );
|
||||||
map = new OpenLayers.Map('map');
|
map = new OpenLayers.Map('map');
|
||||||
control = new OpenLayers.Control.OverviewMap();
|
control = new OpenLayers.Control.OverviewMap();
|
||||||
t.ok( control instanceof OpenLayers.Control.OverviewMap, "new OpenLayers.Control.OverviewMap returns object" );
|
t.ok( control instanceof OpenLayers.Control.OverviewMap,
|
||||||
t.ok( map instanceof OpenLayers.Map, "new OpenLayers.Map creates map" );
|
"new OpenLayers.Control.OverviewMap returns object" );
|
||||||
|
t.ok( map instanceof OpenLayers.Map,
|
||||||
|
"new OpenLayers.Map creates map" );
|
||||||
map.addControl(control);
|
map.addControl(control);
|
||||||
t.ok( control.map === map, "Control.map is set to the map object" );
|
t.ok( control.map === map,
|
||||||
t.ok( map.controls[4] === control, "map.controls contains control" );
|
"Control.map is set to the map object" );
|
||||||
t.eq( parseInt(control.div.style.zIndex), map.Z_INDEX_BASE['Control'] + 5, "Control div zIndexed properly" );
|
t.ok( map.controls[4] === control,
|
||||||
t.eq( parseInt(map.viewPortDiv.lastChild.style.zIndex), map.Z_INDEX_BASE['Control'] + 5, "Viewport div contains control div" );
|
"map.controls contains control" );
|
||||||
|
t.eq( parseInt(control.div.style.zIndex), map.Z_INDEX_BASE['Control'] + 5,
|
||||||
|
"Control div zIndexed properly" );
|
||||||
|
t.eq( parseInt(map.viewPortDiv.lastChild.style.zIndex), map.Z_INDEX_BASE['Control'] + 5,
|
||||||
|
"Viewport div contains control div" );
|
||||||
|
|
||||||
map.destroy();
|
map.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
function test_control_events (t) {
|
function test_control_events (t) {
|
||||||
t.plan( 10 );
|
t.plan( 10 );
|
||||||
var evt = {which: 1}; // control expects left-click
|
var evt = {which: 1}; // control expects left-click
|
||||||
@@ -113,38 +127,55 @@
|
|||||||
|
|
||||||
var centerLL = new OpenLayers.LonLat(-71,42);
|
var centerLL = new OpenLayers.LonLat(-71,42);
|
||||||
map.setCenter(centerLL, 11);
|
map.setCenter(centerLL, 11);
|
||||||
t.delay_call(1, function() {
|
t.delay_call(
|
||||||
var overviewCenter = control.ovmap.getCenter();
|
1,
|
||||||
var overviewZoom = control.ovmap.getZoom();
|
function() {
|
||||||
t.eq(overviewCenter.lon, -71, "Overviewmap center lon correct");
|
var overviewCenter = control.ovmap.getCenter();
|
||||||
t.eq(overviewCenter.lat, 42, "Overviewmap center lat correct");
|
var overviewZoom = control.ovmap.getZoom();
|
||||||
t.eq(overviewZoom, 8, "Overviewmap zoomcorrect");
|
t.eq(overviewCenter.lon, -71,
|
||||||
|
"Overviewmap center lon correct");
|
||||||
|
t.eq(overviewCenter.lat, 42,
|
||||||
|
"Overviewmap center lat correct");
|
||||||
|
t.eq(overviewZoom, 8,
|
||||||
|
"Overviewmap zoomcorrect");
|
||||||
|
|
||||||
control.mapDivClick({'xy':new OpenLayers.Pixel(5,5)});
|
control.mapDivClick({'xy':new OpenLayers.Pixel(5,5)});
|
||||||
}, 2, function() {
|
},
|
||||||
var cent = map.getCenter();
|
2,
|
||||||
t.eq(cent.lon, -71.3515625, "Clicking on the Overview Map has the correct effect on map lon");
|
function() {
|
||||||
t.eq(cent.lat, 42.17578125, "Clicking on the Overview Map has the correct effect on map lat");
|
var cent = map.getCenter();
|
||||||
|
t.eq(cent.lon, -71.3515625,
|
||||||
|
"Clicking on OverviewMap has correct effect on map lon");
|
||||||
|
t.eq(cent.lat, 42.17578125,
|
||||||
|
"Clicking on OverviewMap has correct effect on map lat");
|
||||||
|
|
||||||
control.handlers.drag = {
|
control.handlers.drag = {
|
||||||
last: new OpenLayers.Pixel(5,5),
|
last: new OpenLayers.Pixel(5,5),
|
||||||
destroy: function() {}
|
destroy: function() {}
|
||||||
};
|
};
|
||||||
control.rectDrag(new OpenLayers.Pixel(15, 15));
|
control.rectDrag(new OpenLayers.Pixel(15, 15));
|
||||||
control.updateMapToRect();
|
control.updateMapToRect();
|
||||||
}, 2, function() {
|
},
|
||||||
var cent = map.getCenter();
|
2,
|
||||||
t.eq(cent.lon, -71.2734375, "Dragging on the Overview Map has the correct effect on map lon");
|
function() {
|
||||||
t.eq(cent.lat, 42.09765625, "Dragging on the Overview Map has the correct effect on map lat");
|
var cent = map.getCenter();
|
||||||
|
t.eq(cent.lon, -71.2734375,
|
||||||
|
"Dragging on OverviewMap has correct effect on map lon");
|
||||||
|
t.eq(cent.lat, 42.09765625,
|
||||||
|
"Dragging on OverviewMap has correct effect on map lat");
|
||||||
|
|
||||||
map.setCenter(new OpenLayers.LonLat(0,0), 0);
|
map.setCenter(new OpenLayers.LonLat(0,0), 0);
|
||||||
var overviewCenter = control.ovmap.getCenter();
|
var overviewCenter = control.ovmap.getCenter();
|
||||||
var overviewZoom = control.ovmap.getZoom();
|
var overviewZoom = control.ovmap.getZoom();
|
||||||
t.eq(overviewCenter.lon, 0, "Overviewmap center lon correct -- second zoom");
|
t.eq(overviewCenter.lon, 0,
|
||||||
t.eq(overviewCenter.lat, 0, "Overviewmap center lat correct -- second zoom");
|
"Overviewmap center lon correct -- second zoom");
|
||||||
t.eq(overviewZoom, 0, "Overviewmap zoomcorrect -- second zoom");
|
t.eq(overviewCenter.lat, 0,
|
||||||
map.destroy();
|
"Overviewmap center lat correct -- second zoom");
|
||||||
});
|
t.eq(overviewZoom, 0,
|
||||||
|
"Overviewmap zoomcorrect -- second zoom");
|
||||||
|
map.destroy();
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function test_initialize_maximized(t) {
|
function test_initialize_maximized(t) {
|
||||||
@@ -156,8 +187,10 @@
|
|||||||
controls: [control]
|
controls: [control]
|
||||||
});
|
});
|
||||||
|
|
||||||
t.eq(control.maximized, false, "OverviewMap is not maximized by default");
|
t.eq(control.maximized, false,
|
||||||
t.eq(control.element.style.display, 'none', "OverviewMap.element is not visible");
|
"OverviewMap is not maximized by default");
|
||||||
|
t.eq(control.element.style.display, 'none',
|
||||||
|
"OverviewMap.element is not visible");
|
||||||
map.destroy();
|
map.destroy();
|
||||||
|
|
||||||
control = new OpenLayers.Control.OverviewMap({
|
control = new OpenLayers.Control.OverviewMap({
|
||||||
@@ -167,8 +200,10 @@
|
|||||||
layers : [new OpenLayers.Layer("layer", {isBaseLayer: true})],
|
layers : [new OpenLayers.Layer("layer", {isBaseLayer: true})],
|
||||||
controls: [control]
|
controls: [control]
|
||||||
});
|
});
|
||||||
t.eq(control.maximized, true, "OverviewMap.maximized is set");
|
t.eq(control.maximized, true,
|
||||||
t.eq(control.element.style.display, '', "OverviewMap.element is visible");
|
"OverviewMap.maximized is set");
|
||||||
|
t.eq(control.element.style.display, '',
|
||||||
|
"OverviewMap.element is visible");
|
||||||
|
|
||||||
map.destroy();
|
map.destroy();
|
||||||
}
|
}
|
||||||
@@ -176,6 +211,6 @@
|
|||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="map" style="width: 1024px; height: 512px;"/>
|
<div id="map" style="width: 1024px; height: 512px;"></div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Reference in New Issue
Block a user