OpenLayers OpenLayers

Changeset 5478

Show
Ignore:
Timestamp:
12/17/07 22:44:21 (1 year ago)
Author:
crschmidt
Message:

Remove XML prolog from tests. Browsers can't seem to decide whether they like
it or not, and #1218 will cause the behavior to change across the board,
most likely, so we'll just be slightly more accepting, since the XML prolog
is almost definitely unlikely to not matter.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/tests/Format/test_GML.html

    r5456 r5478  
    4343        data = parser.read(point); 
    4444        var output = parser.write(data); 
     45        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    4546        t.eq(output, point, "Point geometry round trips correctly."); 
    4647         
    …… 
    4849        data = parser.read(linestring); 
    4950        var output = parser.write(data); 
     51        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    5052        t.eq(output, linestring, "Line geometry round trips correctly."); 
    5153         
    …… 
    5355        data = parser.read(polygon); 
    5456        var output = parser.write(data); 
     57        output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    5558        t.eq(output, polygon, "Poly geometry round trips correctly."); 
    5659         
    …… 
    5861        data = parser.read(multipoint); 
    5962        var output = parser.write(data); 
     63        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    6064        t.eq(output, multipoint, "MultiPoint geometry round trips correctly."); 
    6165         
    …… 
    6367        data = parser.read(multilinestring); 
    6468        var output = parser.write(data); 
     69        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    6570        t.eq(output, multilinestring, "MultiLine geometry round trips correctly."); 
    6671    }     
    …… 
    289294        data = parser.read(point); 
    290295        var output = parser.write(data); 
     296        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    291297        t.eq(output, point_xy, "Point geometry round trips correctly."); 
    292298         
    …… 
    295301        data = parser.read(linestring); 
    296302        var output = parser.write(data); 
     303        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    297304        t.eq(output, linestring_xy, "Line geometry round trips correctly."); 
    298305         
    …… 
    301308        data = parser.read(polygon); 
    302309        var output = parser.write(data); 
     310        output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    303311        t.eq(output, polygon_xy, "Poly geometry round trips correctly."); 
    304312         
    …… 
    307315        data = parser.read(multipoint); 
    308316        var output = parser.write(data); 
     317        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    309318        t.eq(output, multipoint_xy, "MultiPoint geometry round trips correctly."); 
    310319         
    …… 
    313322        data = parser.read(multilinestring); 
    314323        var output = parser.write(data); 
     324        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    315325        t.eq(output, multilinestring_xy, "MultiLine geometry round trips correctly."); 
    316326    } 

  • trunk/openlayers/tests/Format/test_GeoRSS.html

    r5455 r5478  
    2525        var f = new OpenLayers.Feature.Vector(l); 
    2626        var data = parser.write([f]); 
     27        var data = data.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    2728        t.eq(data, '<rss xmlns="http://backend.userland.com/rss2"><item><title></title><description></description><georss:line xmlns:georss="http://www.georss.org/georss">45.68 -111.04 45.68 -112.04</georss:line></item></rss>', 'GeoRSS serializes a line correctly'); 
    2829    } 
    …… 
    4647                expected_result = expected_result.replace(/&gt;/g, ">"); 
    4748            } 
     49            var out = out.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    4850            t.eq(out, expected_result, "Output gave expected value"); 
    4951        } 
    …… 
    6062                expected_result = expected_result.replace(/&gt;/g, ">"); 
    6163            } 
     64            var out = out.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    6265            t.eq(out, expected_result, "Output gave expected value"); 
    6366        } 

  • trunk/openlayers/tests/Format/test_KML.html

    r5477 r5478  
    5959        var features = format.read(kmlExpected); 
    6060        var kmlOut = format.write(features); 
     61        var kmlOut = kmlOut.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    6162        t.eq(kmlOut, kmlExpected, "correctly writes an KML doc string"); 
    6263    } 
    …… 
    8485        output = format.write(feature); 
    8586        expected = '<kml xmlns="http://earth.google.com/kml/2.0"><Folder><name>OpenLayers export</name><description>test output</description><Placemark><name>test name</name><description>No description available</description><MultiGeometry><Point><coordinates>0,1</coordinates></Point></MultiGeometry></Placemark></Folder></kml>'; 
     87        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    8688        t.eq(output, expected, "multipoint correctly written"); 
    8789         
    …… 
    9698        output = format.write(feature); 
    9799        expected = '<kml xmlns="http://earth.google.com/kml/2.0"><Folder><name>OpenLayers export</name><description>test output</description><Placemark><name>test name</name><description>No description available</description><MultiGeometry><LineString><coordinates>1,0 0,1</coordinates></LineString></MultiGeometry></Placemark></Folder></kml>'; 
     100        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    98101        t.eq(output, expected, "multilinestring correctly written"); 
    99102 
    …… 
    111114        output = format.write(feature); 
    112115        expected = '<kml xmlns="http://earth.google.com/kml/2.0"><Folder><name>OpenLayers export</name><description>test output</description><Placemark><name>test name</name><description>No description available</description><MultiGeometry><Polygon><outerBoundaryIs><LinearRing><coordinates>0,0 1,0 0,1 0,0</coordinates></LinearRing></outerBoundaryIs></Polygon></MultiGeometry></Placemark></Folder></kml>'; 
     116        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog 
    113117        t.eq(output, expected, "multilinestring correctly written"); 
    114118