OpenLayers OpenLayers

Changeset 5474

Show
Ignore:
Timestamp:
12/17/07 12:09:42 (1 year ago)
Author:
crschmidt
Message:

FF and Opera have different ideas about how this test should work.
FF2 won't work unless the map is loaded 'onload' -- but in Opera, adding
something to onload causes opera to believe that the page never finishes
loading within the test framework. FF3 works fine with this test if we
don't run it in a new window, but FF2 does not. For the time being, make
it work in our most well-supported platform -- FF2 -- and add a
FIXME to make it work in Opera.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/tests/Control/test_PanZoom.html

    r5463 r5474  
    3333 
    3434    function test_03_Control_PanZoom_control_events (t) { 
    35         loader(); 
    36         if ( !window.document.createEvent ) { 
     35 
     36        if ( !window.document.createEvent || OpenLayers.Util.getBrowserName() == "opera") { 
    3737            //ie can't simulate mouseclicks 
    38             t.plan(0) 
     38            t.plan(0); 
     39            t.debug_print("FIXME: This browser does not support the PanZoom test at this time."); 
    3940        } else { 
    4041            t.plan(35); 
    41                 t.delay_call( 1, function() { 
     42            t.open_window( "Control/test_PanZoom.html", function( wnd ) { 
     43                t.delay_call( 3, function() { 
    4244                    var flag; 
    4345                    function setFlag(evt) { 
    …… 
    5456                    resetFlags(); 
    5557                     
    56                     window.mapper.events.register("mousedown", mapper, setFlag); 
    57                     window.mapper.events.register("mouseup", mapper, setFlag); 
    58                     window.mapper.events.register("click", mapper, setFlag); 
    59                     window.mapper.events.register("dblclick", mapper, setFlag); 
     58                    wnd.mapper.events.register("mousedown", mapper, setFlag); 
     59                    wnd.mapper.events.register("mouseup", mapper, setFlag); 
     60                    wnd.mapper.events.register("click", mapper, setFlag); 
     61                    wnd.mapper.events.register("dblclick", mapper, setFlag); 
    6062                     
    61                     simulateClick(window, window.control.buttons[0]); 
    62                     t.ok( window.mapper.getCenter().lat > window.centerLL.lat, "Pan up works correctly" ); 
     63                    simulateClick(wnd, wnd.control.buttons[0]); 
     64                    t.ok( wnd.mapper.getCenter().lat > wnd.centerLL.lat, "Pan up works correctly" ); 
    6365                    t.ok(!flag.mousedown, "mousedown does not get to the map"); 
    6466                    t.ok(flag.mouseup, "mouseup does get to the map"); 
    …… 
    6769                    resetFlags(); 
    6870 
    69                     simulateClick(window, window.control.buttons[1]); 
    70                     t.ok( window.mapper.getCenter().lon < window.centerLL.lon, "Pan left works correctly" ); 
     71                    simulateClick(wnd, wnd.control.buttons[1]); 
     72                    t.ok( wnd.mapper.getCenter().lon < wnd.centerLL.lon, "Pan left works correctly" ); 
    7173                    t.ok(!flag.mousedown, "mousedown does not get to the map"); 
    7274                    t.ok(flag.mouseup, "mouseup does get to the map"); 
    …… 
    7577                    resetFlags(); 
    7678 
    77                     simulateClick(window, window.control.buttons[2]); 
    78                     t.ok( window.mapper.getCenter().lon == window.centerLL.lon, "Pan right works correctly" ); 
     79                    simulateClick(wnd, wnd.control.buttons[2]); 
     80                    t.ok( wnd.mapper.getCenter().lon == wnd.centerLL.lon, "Pan right works correctly" ); 
    7981                    t.ok(!flag.mousedown, "mousedown does not get to the map"); 
    8082                    t.ok(flag.mouseup, "mouseup does get to the map"); 
    …… 
    8385                    resetFlags(); 
    8486 
    85                     simulateClick(window, window.control.buttons[3]); 
    86                     t.ok( window.mapper.getCenter().lat == window.centerLL.lat, "Pan down works correctly" ); 
     87                    simulateClick(wnd, wnd.control.buttons[3]); 
     88                    t.ok( wnd.mapper.getCenter().lat == wnd.centerLL.lat, "Pan down works correctly" ); 
    8789                    t.ok(!flag.mousedown, "mousedown does not get to the map"); 
    8890                    t.ok(flag.mouseup, "mouseup does get to the map"); 
    …… 
    9193                    resetFlags(); 
    9294 
    93                     simulateClick(window, window.control.buttons[4]); 
    94                     t.eq( window.mapper.getZoom(), 6, "zoomin works correctly" ); 
     95                    simulateClick(wnd, wnd.control.buttons[4]); 
     96                    t.eq( wnd.mapper.getZoom(), 6, "zoomin works correctly" ); 
    9597                    t.ok(!flag.mousedown, "mousedown does not get to the map"); 
    9698                    t.ok(flag.mouseup, "mouseup does get to the map"); 
    …… 
    99101                    resetFlags(); 
    100102 
    101                     simulateClick(window, window.control.buttons[6]); 
    102                     t.eq( window.mapper.getZoom(), 5, "zoomout works correctly" ); 
     103                    simulateClick(wnd, wnd.control.buttons[6]); 
     104                    t.eq( wnd.mapper.getZoom(), 5, "zoomout works correctly" ); 
    103105                    t.ok(!flag.mousedown, "mousedown does not get to the map"); 
    104106                    t.ok(flag.mouseup, "mouseup does get to the map"); 
    …… 
    107109                    resetFlags(); 
    108110 
    109                     simulateClick(window, window.control.buttons[5]); 
    110                     t.eq( window.mapper.getZoom(), 2, "zoomworld works correctly" ); 
     111                    simulateClick(wnd, wnd.control.buttons[5]); 
     112                    t.eq( wnd.mapper.getZoom(), 2, "zoomworld works correctly" ); 
    111113                    t.ok(!flag.mousedown, "mousedown does not get to the map"); 
    112114                    t.ok(flag.mouseup, "mouseup does get to the map"); 
    …… 
    116118                     
    117119                }); 
     120            }); 
    118121        } 
    119122    } 
    120123 
    121     function simulateClick(window, elem) { 
    122       var evt = window.document.createEvent("MouseEvents"); 
    123       evt.initMouseEvent("mousedown", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
     124    function simulateClick(wnd, elem) { 
     125      var evt = wnd.document.createEvent("MouseEvents"); 
     126      evt.initMouseEvent("mousedown", true, true, wnd, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
    124127      elem.dispatchEvent(evt); 
    125128 
    126       evt = window.document.createEvent("MouseEvents"); 
    127       evt.initMouseEvent("mouseup", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
     129      evt = wnd.document.createEvent("MouseEvents"); 
     130      evt.initMouseEvent("mouseup", true, true, wnd, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
    128131      elem.dispatchEvent(evt); 
    129132 
    130       evt = window.document.createEvent("MouseEvents"); 
    131       evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
     133      evt = wnd.document.createEvent("MouseEvents"); 
     134      evt.initMouseEvent("click", true, true, wnd, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
    132135      elem.dispatchEvent(evt); 
    133136 
    134       evt = window.document.createEvent("MouseEvents"); 
    135       evt.initMouseEvent("dblclick", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
     137      evt = wnd.document.createEvent("MouseEvents"); 
     138      evt.initMouseEvent("dblclick", true, true, wnd, 0, 0, 0, 0, 0, false, false, false, false, 0, null); 
    136139      elem.dispatchEvent(evt); 
    137140    } 
    …… 
    155158  </script> 
    156159</head> 
    157 <body> 
     160<body onload="loader()"> 
    158161    <div id="map" style="width: 1024px; height: 512px;"/> 
    159162</body>