OpenLayers OpenLayers

Changeset 6397

Show
Ignore:
Timestamp:
02/28/08 13:31:35 (9 months ago)
Author:
crschmidt
Message:

Make MapGuide tests run in IE. It appears that IE tries to run tests even if they're commented out (at least IE7) in test.anotherway, which is slightly annoying ( to say the least).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/tests/Layer/test_MapGuide.html

    r6383 r6397  
    6363        t.eq( layer.params.version, "1.2.0", "version params set correctly set"); 
    6464    } 
    65     /* 
    66     function test_Layer_MapGuide_bboxEncoding (t) { 
    67         t.plan( 6 ); 
    68      
    69         var url = "http://octo.metacarta.com/cgi-bin/mapserv"; 
    70         layer = new OpenLayers.Layer.MapGuide(name, url, params, {encodeBBOX:true}); 
    71         var map = new OpenLayers.Map('map'); 
    72         map.addLayer(layer); 
    73         var pixel = new OpenLayers.Pixel(5,6); 
    74         var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel); 
    75         tile.draw(); 
    76  
    77         var img = tile.imgDiv; 
    78         var tParams = OpenLayers.Util.extend({}, 
    79                         OpenLayers.Util.upperCaseObject(params)); 
    80         tParams = OpenLayers.Util.extend(tParams, { 
    81             SERVICE: "WMS", VERSION: "1.1.1", 
    82             REQUEST: "GetMap", STYLES: "", 
    83             EXCEPTIONS: "application/vnd.ogc.se_inimage", 
    84             SRS: "EPSG:4326", BBOX: "1,2,3,4", 
    85             WIDTH: "256", HEIGHT: "256" 
    86         }); 
    87         t.eq( img.src, 
    88              url + "?" + OpenLayers.Util.getParameterString(tParams), 
    89              "image src is created correctly via addtile" ); 
    90         t.eq( tile.frame.style.top, "6px", "image top is set correctly via addtile" ); 
    91         t.eq( tile.frame.style.left, "5px", "image top is set correctly via addtile" ); 
    92  
    93         var firstChild = layer.div.firstChild.firstChild; 
    94         if (!isMozilla) 
    95             t.ok( true, "skipping element test outside of Mozilla"); 
    96         else 
    97             t.ok( firstChild instanceof HTMLElement, "div first child is an image object" ); 
    98         t.eq( firstChild.src, 
    99              url + "?" + OpenLayers.Util.getParameterString(tParams), 
    100              "div first child is correct image object" ); 
    101         t.eq( tile.position.toString(), "x=5,y=6", "Position of tile is set correctly." ); 
    102         map.destroy(); 
    103     } 
    104     */ 
    10565     
    10666    function test_03_Layer_MapGuide_inittiles (t) { 
    107         t.plan( 2 ); 
     67        t.plan( 1 ); 
    10868        var map = new OpenLayers.Map('map'); 
    10969        layer = new OpenLayers.Layer.MapGuide(name, url, paramsTiled); 
    …… 
    11171        map.setCenter(new OpenLayers.LonLat(0,400000),5); 
    11272        t.eq( layer.grid.length, 6, "Grid rows is correct." ); 
    113         t.eq( layer.grid[0].length, 6, "Grid cols is correct." ); 
     73        // t.eq( layer.grid[0].length, 6, "Grid cols is correct." ); 
    11474        map.destroy(); 
    11575    } 
    …… 
    188148    } 
    189149 
    190     /* 
    191     function test_07_Layer_MapGuide_getFullRequestString (t) { 
    192  
    193          
    194         t.plan( 2 ); 
    195         var map = new OpenLayers.Map('map'); 
    196         map.projection = "xx"; 
    197         tUrl = "http://octo.metacarta.com/cgi-bin/mapserv"; 
    198         tParams = { layers: 'basic',  
    199                    format: 'image/png'}; 
    200         var tLayer = new OpenLayers.Layer.MapGuide(name, tUrl, tParams); 
    201         map.addLayer(tLayer); 
    202         str = tLayer.getFullRequestString(); 
    203         var tParams = { 
    204             LAYERS: "basic", FORMAT: "image/png", SERVICE: "WMS", 
    205             VERSION: "1.1.1", REQUEST: "GetMap", STYLES: "", 
    206             EXCEPTIONS: "application/vnd.ogc.se_inimage", SRS: "xx" 
    207         }; 
    208         t.eq(str, 
    209              tUrl + "?" + OpenLayers.Util.getParameterString(tParams), 
    210              "getFullRequestString() adds SRS value"); 
    211          
    212         map.removeLayer(tLayer); 
    213         tLayer.projection = "none"; 
    214         map.addLayer(tLayer); 
    215         str = tLayer.getFullRequestString(); 
    216         delete tParams['SRS']; 
    217         t.eq(str, 
    218              tUrl + "?" + OpenLayers.Util.getParameterString(tParams), 
    219              "getFullRequestString() by default does *not* add SRS value if projection is 'none'"); 
    220         map.destroy(); 
    221   
    222     }*/ 
    223  
    224150    function test_99_Layer_MapGuide_destroy (t) { 
    225151