From b95e9dac118f67c606fb1016a93af6efdb1a5dc8 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Thu, 7 Apr 2011 18:29:18 +0000 Subject: [PATCH] Reworking test so failures are deterministic. git-svn-id: http://svn.openlayers.org/trunk/openlayers@11884 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- tests/Style.html | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/Style.html b/tests/Style.html index 2165134018..a6071a59c2 100644 --- a/tests/Style.html +++ b/tests/Style.html @@ -127,8 +127,16 @@ } function test_Style_createSymbolizer(t) { - t.plan(2); + t.plan(4); var style = new OpenLayers.Style(); + + // override applySymbolizer to log arguments + var log = []; + style.applySymbolizer = function(r) { + log.push(r); + OpenLayers.Style.prototype.applySymbolizer.apply(this, arguments); + }; + var rule = new OpenLayers.Rule({ id: Math.random() }); @@ -138,17 +146,19 @@ }); style.addRules([rule, elseRule]); - // test that applySymbolizer is only called with rule - style.applySymbolizer = function(r) { - t.eq(r.id, rule.id, "(plain) applySymbolizer called with correct rule"); - } + // a) test that applySymbolizer is only called with rule + log = []; style.createSymbolizer(new OpenLayers.Feature.Vector()); + t.eq(log.length, 1, "a) applySymbolizer called once"); + t.eq(log[0] && log[0].id, rule.id, "a) applySymbolizer called with correct rule"); + // b) test that applySymbolizer is only called with elseRule + log = []; rule.evaluate = function() {return false;}; - style.applySymbolizer = function(r) { - t.eq(r.id, elseRule.id, "(else) applySymbolizer called with correct rule"); - }; style.createSymbolizer(new OpenLayers.Feature.Vector()); + t.eq(log.length, 1, "b) applySymbolizer called once"); + t.eq(log[0] && log[0].id, elseRule.id, "b) applySymbolizer called with correct rule"); + } function test_Style_applySymbolizer(t) {