applies latest patch to the renderers tests, special thanks to pgiraud for his great work! (hopefully closes #1128 this time)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@5340 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -5,7 +5,8 @@
|
||||
|
||||
function test_Elements_constructor(t) {
|
||||
t.plan(5);
|
||||
var el = document.body;
|
||||
var el = document.createElement('div');
|
||||
document.body.appendChild(el);
|
||||
el.id = "foo";
|
||||
|
||||
OpenLayers.Renderer.Elements.prototype._createRenderRoot =
|
||||
@@ -14,7 +15,7 @@
|
||||
var rendererRoot = document.createElement("div");
|
||||
OpenLayers.Renderer.Elements.prototype.createRenderRoot = function() {
|
||||
return rendererRoot;
|
||||
}
|
||||
};
|
||||
|
||||
OpenLayers.Renderer.Elements.prototype._createRoot =
|
||||
OpenLayers.Renderer.Elements.prototype.createRoot;
|
||||
@@ -22,7 +23,7 @@
|
||||
var root = document.createElement("div");
|
||||
OpenLayers.Renderer.Elements.prototype.createRoot = function() {
|
||||
return root;
|
||||
}
|
||||
};
|
||||
|
||||
var r = new OpenLayers.Renderer.Elements("foo");
|
||||
|
||||
@@ -31,7 +32,7 @@
|
||||
t.ok(r.root != null, "elements root is not null");
|
||||
|
||||
t.ok(r.root.parentNode == rendererRoot, "elements root is correctly appended to rendererRoot");
|
||||
t.ok(r.rendererRoot.parentNode == document.body, "elements rendererRoot is correctly appended to container");
|
||||
t.ok(r.rendererRoot.parentNode == el, "elements rendererRoot is correctly appended to container");
|
||||
|
||||
OpenLayers.Renderer.Elements.prototype.createRenderRoot =
|
||||
OpenLayers.Renderer.Elements.prototype._createRenderRoot;
|
||||
@@ -54,12 +55,12 @@
|
||||
|
||||
OpenLayers.Renderer.prototype.destroy = function() {
|
||||
g_Destroy = true;
|
||||
}
|
||||
};
|
||||
|
||||
var r = new OpenLayers.Renderer.SVG(document.body);
|
||||
r.clear = function() {
|
||||
g_Clear = true;
|
||||
}
|
||||
};
|
||||
r.rendererRoot = 'foo';
|
||||
r.root = 'bar';
|
||||
r.xmlns = 'dude';
|
||||
@@ -117,15 +118,15 @@
|
||||
r.nodeFactory = function(id, type) {
|
||||
var element = document.createElement("div");
|
||||
return element;
|
||||
}
|
||||
};
|
||||
var g_Node = null;
|
||||
r.drawGeometryNode = function(node, geometry, style) {
|
||||
g_Node = node;
|
||||
return node;
|
||||
}
|
||||
};
|
||||
r.getNodeType = function(geometry, style) {
|
||||
return "div";
|
||||
}
|
||||
};
|
||||
geometry = {
|
||||
id: 'foo',
|
||||
CLASS_NAME: 'bar'
|
||||
@@ -158,7 +159,7 @@
|
||||
r.nodeFactory = function(id, type) {
|
||||
var element = document.createElement("div");
|
||||
return element;
|
||||
}
|
||||
};
|
||||
r.setStyle = function(node, style, options, geometry) {
|
||||
return node;
|
||||
};
|
||||
@@ -168,7 +169,7 @@
|
||||
r.drawPoint = function(node, geometry) {
|
||||
properDraw = true;
|
||||
return {};
|
||||
}
|
||||
};
|
||||
geometry = {CLASS_NAME: 'OpenLayers.Geometry.Point'};
|
||||
style = true;
|
||||
r.drawGeometry(geometry, style);
|
||||
@@ -179,7 +180,7 @@
|
||||
r.drawLineString = function(g) {
|
||||
properDraw = true;
|
||||
return {};
|
||||
}
|
||||
};
|
||||
geometry = {CLASS_NAME: 'OpenLayers.Geometry.LineString'};
|
||||
style = true;
|
||||
r.drawGeometry(geometry, style);
|
||||
@@ -190,7 +191,7 @@
|
||||
r.drawLinearRing = function(g) {
|
||||
properDraw = true;
|
||||
return {};
|
||||
}
|
||||
};
|
||||
geometry = {CLASS_NAME: 'OpenLayers.Geometry.LinearRing'};
|
||||
style = true;
|
||||
r.drawGeometry(geometry, style);
|
||||
@@ -201,7 +202,7 @@
|
||||
r.drawPolygon = function(g) {
|
||||
properDraw = true;
|
||||
return {};
|
||||
}
|
||||
};
|
||||
geometry = {CLASS_NAME: 'OpenLayers.Geometry.Polygon'};
|
||||
style = true;
|
||||
r.drawGeometry(geometry, style);
|
||||
@@ -223,7 +224,7 @@
|
||||
r.drawRectangle = function(g) {
|
||||
properDraw = true;
|
||||
return {};
|
||||
}
|
||||
};
|
||||
geometry = {CLASS_NAME: 'OpenLayers.Geometry.Rectangle'};
|
||||
style = true;
|
||||
r.drawGeometry(geometry, style);
|
||||
@@ -234,7 +235,7 @@
|
||||
r.drawPoint = function(g) {
|
||||
properDraw = true;
|
||||
return {};
|
||||
}
|
||||
};
|
||||
geometry = {
|
||||
CLASS_NAME: 'OpenLayers.Geometry.MultiPoint',
|
||||
components: [{CLASS_NAME: 'OpenLayers.Geometry.Point'}]
|
||||
@@ -248,7 +249,7 @@
|
||||
r.drawLineString = function(g) {
|
||||
properDraw = true;
|
||||
return {};
|
||||
}
|
||||
};
|
||||
geometry = {
|
||||
CLASS_NAME: 'OpenLayers.Geometry.MultiLineString',
|
||||
components: [{CLASS_NAME: 'OpenLayers.Geometry.LineString'}]
|
||||
@@ -262,7 +263,7 @@
|
||||
r.drawPolygon = function(g) {
|
||||
properDraw = true;
|
||||
return {};
|
||||
}
|
||||
};
|
||||
geometry = {
|
||||
CLASS_NAME: 'OpenLayers.Geometry.MultiPolygon',
|
||||
components: [{CLASS_NAME: 'OpenLayers.Geometry.Polygon'}]
|
||||
@@ -280,17 +281,17 @@
|
||||
|
||||
var node = {
|
||||
_featureId: 'foo'
|
||||
}
|
||||
};
|
||||
var event = {
|
||||
target: node
|
||||
}
|
||||
};
|
||||
|
||||
var id = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent(event);
|
||||
t.eq(id, 'foo', "returned id is correct when event with target is passed");
|
||||
|
||||
var event = {
|
||||
srcElement: node
|
||||
}
|
||||
};
|
||||
|
||||
var id = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent(event);
|
||||
t.eq(id, 'foo', "returned id is correct when event with srcElement is passed");
|
||||
@@ -301,22 +302,21 @@
|
||||
|
||||
var el = document.createElement('div');
|
||||
document.body.appendChild(el);
|
||||
el.id = 'foo';
|
||||
el.id = 'bar';
|
||||
var geometry = {
|
||||
id: 'foo'
|
||||
id: 'bar'
|
||||
};
|
||||
|
||||
OpenLayers.Renderer.Elements.prototype.eraseGeometry(geometry);
|
||||
t.ok(el.parentNode != document.body, "element correctly removed");
|
||||
|
||||
|
||||
var el = document.createElement('div');
|
||||
document.body.appendChild(el);
|
||||
el.id = 'foo';
|
||||
el.id = 'bar';
|
||||
var geometry = {
|
||||
CLASS_NAME: "OpenLayers.Geometry.MultiPoint",
|
||||
components: [{
|
||||
id: 'foo'
|
||||
id: 'bar'
|
||||
}]
|
||||
};
|
||||
|
||||
@@ -325,11 +325,11 @@
|
||||
|
||||
var el = document.createElement('div');
|
||||
document.body.appendChild(el);
|
||||
el.id = 'foo';
|
||||
el.id = 'bar';
|
||||
var geometry = {
|
||||
CLASS_NAME: "OpenLayers.Geometry.MultiLineString",
|
||||
components: [{
|
||||
id: 'foo'
|
||||
id: 'bar'
|
||||
}]
|
||||
};
|
||||
|
||||
@@ -338,11 +338,11 @@
|
||||
|
||||
var el = document.createElement('div');
|
||||
document.body.appendChild(el);
|
||||
el.id = 'foo';
|
||||
el.id = 'bar';
|
||||
var geometry = {
|
||||
CLASS_NAME: "OpenLayers.Geometry.MultiPolygon",
|
||||
components: [{
|
||||
id: 'foo'
|
||||
id: 'bar'
|
||||
}]
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user