From a2773322380cb08b5c37a1278b677bff47cc8f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Mon, 3 Dec 2007 08:13:04 +0000 Subject: [PATCH] fix test_Elements.html tests and make them compatible with r5323 (#1172) (closes #1184) git-svn-id: http://svn.openlayers.org/trunk/openlayers@5329 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- tests/Renderer/test_Elements.html | 1088 +---------------------------- 1 file changed, 9 insertions(+), 1079 deletions(-) diff --git a/tests/Renderer/test_Elements.html b/tests/Renderer/test_Elements.html index eeca92a067..66b1bb59ca 100644 --- a/tests/Renderer/test_Elements.html +++ b/tests/Renderer/test_Elements.html @@ -114,16 +114,16 @@ var element = document.createElement("div"); r.root = element; - r.nodeFactory = function(gid, nt, g) { + r.nodeFactory = function(id, type) { var element = document.createElement("div"); return element; } var g_Node = null; - r.drawGeometryNode = function(n, g) { - g_Node = n; - return; + r.drawGeometryNode = function(node, geometry, style) { + g_Node = node; + return node; } - r.getNodeType = function(geometry) { + r.getNodeType = function(geometry, style) { return "div"; } geometry = { @@ -155,1088 +155,18 @@ var element = document.createElement("div"); r.root = element; - r.nodeFactory = function(gid, nt, g) { + r.nodeFactory = function(id, type) { var element = document.createElement("div"); return element; } - r.setStyle = function() {}; + r.setStyle = function(node, style, options, geometry) { + return node; + }; // point var properDraw = false; r.drawPoint = function(node, geometry) { properDraw = true; - node = node; - return {}; - } - geometry = {CLASS_NAME: 'OpenLayers.Geometry.Point'}; - style = true; - r.drawGeometry(geometry, style); - t.ok(properDraw, "drawGeometry called drawPoint when passed a point"); - - // line string - var properDraw = false; - r.drawLineString = function(g) { - properDraw = true; - return {}; - } - geometry = {CLASS_NAME: 'OpenLayers.Geometry.LineString'}; - style = true; - r.drawGeometry(geometry, style); - t.ok(properDraw, "drawGeometry called drawLineString when passed a line string"); - - // linear ring - var properDraw = false; - r.drawLinearRing = function(g) { - properDraw = true; - return {}; - } - geometry = {CLASS_NAME: 'OpenLayers.Geometry.LinearRing'}; - style = true; - r.drawGeometry(geometry, style); - t.ok(properDraw, "drawGeometry called drawLinearRing when passed a linear ring"); - - // polygon - var properDraw = false; - r.drawPolygon = function(g) { - properDraw = true; - return {}; - } - geometry = {CLASS_NAME: 'OpenLayers.Geometry.Polygon'}; - style = true; - r.drawGeometry(geometry, style); - t.ok(properDraw, "drawGeometry called drawPolygon when passed a polygon"); - - // surface - var properDraw = false; - r.drawSurface = function(g) { - properDraw = true; - return {}; - } - geometry = {CLASS_NAME: 'OpenLayers.Geometry.Surface'}; - style = true; - r.drawGeometry(geometry, style); - t.ok(properDraw, "drawGeometry called drawSurface when passed a surface"); - - // rectangle - var properDraw = false; - r.drawRectangle = function(g) { - properDraw = true; - return {}; - } - geometry = {CLASS_NAME: 'OpenLayers.Geometry.Rectangle'}; - style = true; - r.drawGeometry(geometry, style); - t.ok(properDraw, "drawGeometry called drawRectangle when passed a rectangle"); - - // multi-point - var properDraw = false; - r.drawPoint = function(g) { - properDraw = true; - return {}; - } - geometry = { - CLASS_NAME: 'OpenLayers.Geometry.MultiPoint', - components: [{CLASS_NAME: 'OpenLayers.Geometry.Point'}] - }; - style = true; - r.drawGeometry(geometry, style); - t.ok(properDraw, "drawGeometry called drawPoint when passed a multi-point"); - - // multi-linestring - var properDraw = false; - r.drawLineString = function(g) { - properDraw = true; - return {}; - } - geometry = { - CLASS_NAME: 'OpenLayers.Geometry.MultiLineString', - components: [{CLASS_NAME: 'OpenLayers.Geometry.LineString'}] - }; - style = true; - r.drawGeometry(geometry, style); - t.ok(properDraw, "drawGeometry called drawLineString when passed a multi-linestring"); - - // multi-polygon - var properDraw = false; - r.drawPolygon = function(g) { - properDraw = true; - return {}; - } - geometry = { - CLASS_NAME: 'OpenLayers.Geometry.MultiPolygon', - components: [{CLASS_NAME: 'OpenLayers.Geometry.Polygon'}] - }; - style = true; - r.drawGeometry(geometry, style); - t.ok(properDraw, "drawGeometry called drawPolygon when passed a multi-polygon"); - - OpenLayers.Renderer.Elements.prototype.initialize = - OpenLayers.Renderer.Elements.prototype._initialize; - } - - function test_Elements_getfeatureidfromevent(t) { - t.plan(2); - - 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"); - } - - function test_Elements_erasegeometry(t) { - t.plan(4); - - var el = document.createElement('div'); - document.body.appendChild(el); - el.id = 'foo'; - var geometry = { - id: 'foo' - }; - - 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'; - var geometry = { - CLASS_NAME: "OpenLayers.Geometry.MultiPoint", - components: [{ - id: 'foo' - }] - }; - - OpenLayers.Renderer.Elements.prototype.eraseGeometry(geometry); - t.ok(el.parentNode != document.body, "geometry components correctly removed when passed a multipoint"); - - var el = document.createElement('div'); - document.body.appendChild(el); - el.id = 'foo'; - var geometry = { - CLASS_NAME: "OpenLayers.Geometry.MultiLineString", - components: [{ - id: 'foo' - }] - }; - - OpenLayers.Renderer.Elements.prototype.eraseGeometry(geometry); - t.ok(el.parentNode != document.body, "geometry components correctly removed when passed a multilinestring"); - - var el = document.createElement('div'); - document.body.appendChild(el); - el.id = 'foo'; - var geometry = { - CLASS_NAME: "OpenLayers.Geometry.MultiPolygon", - components: [{ - id: 'foo' - }] - }; - - OpenLayers.Renderer.Elements.prototype.eraseGeometry(geometry); - t.ok(el.parentNode != document.body, "geometry components correctly removed when passed a multipolygon"); - } - - - - -
- - - - - - - - -
- - - - - - - - -
- - - - - -