From a50bfb4d4e2994f115945c70c90ec8a7639777cd Mon Sep 17 00:00:00 2001 From: crschmidt Date: Tue, 18 Dec 2007 03:44:21 +0000 Subject: [PATCH] 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. git-svn-id: http://svn.openlayers.org/trunk/openlayers@5478 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- tests/Format/test_GML.html | 10 ++++++++++ tests/Format/test_GeoRSS.html | 3 +++ tests/Format/test_KML.html | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/tests/Format/test_GML.html b/tests/Format/test_GML.html index 152e847909..36b5447bd0 100644 --- a/tests/Format/test_GML.html +++ b/tests/Format/test_GML.html @@ -42,26 +42,31 @@ var point = shell_start + serialize_geoms['point'] + shell_end; data = parser.read(point); var output = parser.write(data); + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, point, "Point geometry round trips correctly."); var linestring = shell_start + serialize_geoms['linestring'] + shell_end; data = parser.read(linestring); var output = parser.write(data); + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, linestring, "Line geometry round trips correctly."); var polygon = shell_start + serialize_geoms['polygon'] + shell_end; data = parser.read(polygon); var output = parser.write(data); + output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, polygon, "Poly geometry round trips correctly."); var multipoint = shell_start + serialize_geoms['multipoint'] + shell_end; data = parser.read(multipoint); var output = parser.write(data); + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, multipoint, "MultiPoint geometry round trips correctly."); var multilinestring = shell_start + serialize_geoms['multilinestring'] + shell_end; data = parser.read(multilinestring); var output = parser.write(data); + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, multilinestring, "MultiLine geometry round trips correctly."); } function test_Format_GML_read_point_geom(t) { @@ -288,30 +293,35 @@ var point = shell_start + serialize_geoms_yx['point'] + shell_end; data = parser.read(point); var output = parser.write(data); + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, point_xy, "Point geometry round trips correctly."); var linestring_xy = shell_start + serialize_geoms['linestring'] + shell_end; var linestring = shell_start + serialize_geoms_yx['linestring'] + shell_end; data = parser.read(linestring); var output = parser.write(data); + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, linestring_xy, "Line geometry round trips correctly."); var polygon_xy = shell_start + serialize_geoms['polygon'] + shell_end; var polygon = shell_start + serialize_geoms_yx['polygon'] + shell_end; data = parser.read(polygon); var output = parser.write(data); + output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, polygon_xy, "Poly geometry round trips correctly."); var multipoint_xy = shell_start + serialize_geoms['multipoint'] + shell_end; var multipoint = shell_start + serialize_geoms_yx['multipoint'] + shell_end; data = parser.read(multipoint); var output = parser.write(data); + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, multipoint_xy, "MultiPoint geometry round trips correctly."); var multilinestring_xy = shell_start + serialize_geoms['multilinestring'] + shell_end; var multilinestring = shell_start + serialize_geoms_yx['multilinestring'] + shell_end; data = parser.read(multilinestring); var output = parser.write(data); + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, multilinestring_xy, "MultiLine geometry round trips correctly."); } diff --git a/tests/Format/test_GeoRSS.html b/tests/Format/test_GeoRSS.html index fd6266a4c0..0f9828a88a 100644 --- a/tests/Format/test_GeoRSS.html +++ b/tests/Format/test_GeoRSS.html @@ -24,6 +24,7 @@ var l = new OpenLayers.Geometry.LineString([point, point2]); var f = new OpenLayers.Feature.Vector(l); var data = parser.write([f]); + var data = data.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(data, '45.68 -111.04 45.68 -112.04', 'GeoRSS serializes a line correctly'); } function test_Format_GeoRSS_w3cgeo(t) { @@ -45,6 +46,7 @@ if (OpenLayers.Util.getBrowserName() == "opera") { expected_result = expected_result.replace(/>/g, ">"); } + var out = out.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(out, expected_result, "Output gave expected value"); } } @@ -59,6 +61,7 @@ if (OpenLayers.Util.getBrowserName() == "opera") { expected_result = expected_result.replace(/>/g, ">"); } + var out = out.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(out, expected_result, "Output gave expected value"); } } diff --git a/tests/Format/test_KML.html b/tests/Format/test_KML.html index 18033760b8..586f4d9585 100644 --- a/tests/Format/test_KML.html +++ b/tests/Format/test_KML.html @@ -58,6 +58,7 @@ var format = new OpenLayers.Format.KML(options); var features = format.read(kmlExpected); var kmlOut = format.write(features); + var kmlOut = kmlOut.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(kmlOut, kmlExpected, "correctly writes an KML doc string"); } @@ -83,6 +84,7 @@ feature = new OpenLayers.Feature.Vector(multi, {name: "test name"}); output = format.write(feature); expected = 'OpenLayers exporttest outputtest nameNo description available0,1'; + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, expected, "multipoint correctly written"); // test multilinestring @@ -95,6 +97,7 @@ feature = new OpenLayers.Feature.Vector(multi, {name: "test name"}); output = format.write(feature); expected = 'OpenLayers exporttest outputtest nameNo description available1,0 0,1'; + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, expected, "multilinestring correctly written"); // test multipolygon @@ -110,6 +113,7 @@ feature = new OpenLayers.Feature.Vector(multi, {name: "test name"}); output = format.write(feature); expected = 'OpenLayers exporttest outputtest nameNo description available0,0 1,0 0,1 0,0'; + var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog t.eq(output, expected, "multilinestring correctly written"); }