diff --git a/tests/BaseTypes/Element.html b/tests/BaseTypes/Element.html index f2d6896d81..fa596785f6 100644 --- a/tests/BaseTypes/Element.html +++ b/tests/BaseTypes/Element.html @@ -111,7 +111,12 @@ } function test_Element_getDimensions(t) { - t.plan(4); + if (!t.open_window) { + t.plan(0); + return; + } else { + t.plan(4); + } //shown t.open_window( "BaseTypes/Element.html", function( wnd ) { diff --git a/tests/Control/PanZoom.html b/tests/Control/PanZoom.html index 78a15c22dc..da31b5eb07 100644 --- a/tests/Control/PanZoom.html +++ b/tests/Control/PanZoom.html @@ -33,7 +33,7 @@ function test_Control_PanZoom_control_events (t) { - if ( !window.document.createEvent || OpenLayers.Util.getBrowserName() == "opera") { + if ( !window.document.createEvent || OpenLayers.Util.getBrowserName() == "opera" || !t.open_window) { //ie can't simulate mouseclicks t.plan(0); t.debug_print("FIXME: This browser does not support the PanZoom test at this time."); diff --git a/tests/auto-tests.html b/tests/auto-tests.html index 4aaaa0d68c..f467e41900 100644 --- a/tests/auto-tests.html +++ b/tests/auto-tests.html @@ -2259,6 +2259,9 @@ onload=function() } }else if( param[0]=="testframe_no_clear" ) { Test.AnotherWay._g_test_frame_no_clear=true; + }else if( param[0]=="windows" ) { + if (param[1] == "none") { + } }else if( param[0]=="run" ) { auto_run=true; if( param[1]=="all" ) { @@ -2338,6 +2341,7 @@ onload=function() Test.AnotherWay._run_pages_to_run(); } } +Test.AnotherWay._test_object_t.prototype.open_window=null; // --> diff --git a/tests/run-tests.html b/tests/run-tests.html index 13c350b5ec..bdc3b85c02 100644 --- a/tests/run-tests.html +++ b/tests/run-tests.html @@ -2225,6 +2225,10 @@ onload=function() } }else if( param[0]=="testframe_no_clear" ) { Test.AnotherWay._g_test_frame_no_clear=true; + }else if( param[0]=="windows" ) { + if (param[1] == "none") { + Test.AnotherWay._test_object_t.prototype.open_window=null; + } }else if( param[0]=="run" ) { auto_run=true; if( param[1]=="all" ) {